Merge "[AAI-174 Amsterdam] removed invalid edge rules"

4 files changed, 2401 insertions, 2844 deletions

diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v10.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v10.json
index b1173c2a..1b530356 100644
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v10.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v10.json
@@ -6,7 +6,7 @@
 			"label": "groupsResourcesIn",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -17,7 +17,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -28,7 +28,7 @@
 			"label": "supportsServiceCapability",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -39,7 +39,7 @@
 			"label": "locatedIn",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -50,7 +50,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -61,7 +61,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "${direction}"
@@ -72,7 +72,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -83,7 +83,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -94,7 +94,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -105,7 +105,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -116,7 +116,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -127,8 +127,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -139,7 +138,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -150,7 +149,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -161,7 +160,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -172,7 +171,7 @@
 			"label": "hasCtagPool",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -183,7 +182,7 @@
 			"label": "usesL3Network",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -194,7 +193,7 @@
 			"label": "supportsAvailabilityZone",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -205,7 +204,7 @@
 			"label": "subscribesTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "NONE"
@@ -216,7 +215,7 @@
 			"label": "existsIn",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -227,7 +226,7 @@
 			"label": "hasLInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -238,7 +237,7 @@
 			"label": "hasAvailabilityZone",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -249,7 +248,7 @@
 			"label": "hasLAGInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -260,8 +259,7 @@
 			"label": "usesL3Network",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -272,8 +270,7 @@
 			"label": "runsOnPserver",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -284,7 +281,7 @@
 			"label": "usesVnfImage",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -295,8 +292,7 @@
 			"label": "runsOnVserver",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -307,8 +303,7 @@
 			"label": "hasInstance",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -319,7 +314,7 @@
 			"label": "hasSitePairSet",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -330,7 +325,7 @@
 			"label": "hasNetworkProfile",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -341,7 +336,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -352,29 +347,18 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
 		},
 		{
 			"from": "image",
-			"to": "metadata",
-			"label": "hasMetaData",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
-			"from": "image",
 			"to": "metadatum",
 			"label": "hasMetaDatum",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -385,7 +369,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -396,7 +380,7 @@
 			"label": "hasIpAddress",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -407,7 +391,7 @@
 			"label": "hasIpAddress",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -418,7 +402,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -429,7 +413,7 @@
 			"label": "usesLogicalLink",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -440,7 +424,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -451,7 +435,7 @@
 			"label": "hasVlan",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -462,7 +446,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2One",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -473,7 +457,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -484,7 +468,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -495,7 +479,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -506,7 +490,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -517,10 +501,10 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
-			"prevent-delete": "!${direction}"
+			"prevent-delete": "NONE"
 		},
 		{
 			"from": "l3-interface-ipv6-address-list",
@@ -528,10 +512,10 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
-			"prevent-delete": "!${direction}"
+			"prevent-delete": "NONE"
 		},
 		{
 			"from": "l3-network",
@@ -539,7 +523,7 @@
 			"label": "usesVpnBinding",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -550,7 +534,7 @@
 			"label": "hasSubnet",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "NONE"
@@ -561,7 +545,7 @@
 			"label": "hasInstance",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "NONE"
@@ -572,7 +556,7 @@
 			"label": "hasCtagAssignment",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -583,7 +567,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -594,7 +578,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -605,7 +589,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -616,8 +600,7 @@
 			"label": "usesLAGLink",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -628,8 +611,7 @@
 			"label": "usesPInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -640,7 +622,7 @@
 			"label": "hasLInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -651,8 +633,7 @@
 			"label": "usesLAGLink",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -663,7 +644,7 @@
 			"label": "bridgedTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -674,7 +655,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -685,7 +666,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -696,7 +677,7 @@
 			"label": "startsWith",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -707,7 +688,7 @@
 			"label": "isA",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -718,7 +699,7 @@
 			"label": "hasMetaData",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -729,7 +710,7 @@
 			"label": "connectsTo",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -740,7 +721,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -751,7 +732,7 @@
 			"label": "connectsTo",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -762,7 +743,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -773,7 +754,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -784,7 +765,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -795,7 +776,7 @@
 			"label": "relatedTo",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -806,7 +787,7 @@
 			"label": "startsWith",
 			"direction": "OUT",
 			"multiplicity": "One2One",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -817,7 +798,7 @@
 			"label": "connectsTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -828,7 +809,7 @@
 			"label": "isA",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -839,7 +820,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -850,7 +831,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -861,7 +842,7 @@
 			"label": "targets",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -872,7 +853,7 @@
 			"label": "hasLInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -883,7 +864,7 @@
 			"label": "definedFor",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -894,7 +875,7 @@
 			"label": "supportsServiceCapability",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -905,7 +886,7 @@
 			"label": "hasLInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -916,7 +897,7 @@
 			"label": "usesPhysicalLink",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -927,7 +908,7 @@
 			"label": "usesLogicalLink",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -938,8 +919,7 @@
 			"label": "hasCTag",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -950,7 +930,7 @@
 			"label": "locatedIn",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -961,7 +941,7 @@
 			"label": "locatedIn",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -972,7 +952,7 @@
 			"label": "existsIn",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -983,7 +963,7 @@
 			"label": "hasLAGInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -994,8 +974,7 @@
 			"label": "hasPinterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1006,7 +985,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1017,8 +996,7 @@
 			"label": "hasPinterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1029,7 +1007,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1040,7 +1018,7 @@
 			"label": "locatedIn",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -1051,7 +1029,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1062,7 +1040,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1073,8 +1051,7 @@
 			"label": "hasIPAGFacingVLAN",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1085,8 +1062,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1097,7 +1073,7 @@
 			"label": "hasInstance",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "NONE"
@@ -1108,7 +1084,7 @@
 			"label": "hasRoutingInstance",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1119,7 +1095,7 @@
 			"label": "hasSitePair",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1130,7 +1106,7 @@
 			"label": "hasClassOfService",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1141,7 +1117,7 @@
 			"label": "usesL3Network",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1152,7 +1128,7 @@
 			"label": "relatedTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1163,7 +1139,7 @@
 			"label": "owns",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "${direction}"
@@ -1174,7 +1150,7 @@
 			"label": "hasAvailabilityZone",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -1185,7 +1161,7 @@
 			"label": "locatedIn",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -1196,8 +1172,7 @@
 			"label": "hasPortGroup",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1208,8 +1183,7 @@
 			"label": "runsOnVserver",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1220,7 +1194,7 @@
 			"label": "hasServiceInstance",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "NONE"
@@ -1231,7 +1205,7 @@
 			"label": "hasVNF",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "NONE"
@@ -1242,7 +1216,7 @@
 			"label": "hasIpAddress",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1253,74 +1227,18 @@
 			"label": "hasIpAddress",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
 		},
 		{
-			"from": "vpe",
-			"to": "complex",
-			"label": "locatedIn",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "!${direction}"
-		},
-		{
-			"from": "vpe",
-			"to": "ctag-pool",
-			"label": "usesCtagPool",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
-			"from": "vpe",
-			"to": "l-interface",
-			"label": "hasLInterface",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
-			"from": "vpe",
-			"to": "lag-interface",
-			"label": "hasLAGInterface",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
-			"from": "vpe",
-			"to": "vserver",
-			"label": "runsOnVserver",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
 			"from": "vpls-pe",
 			"to": "complex",
 			"label": "locatedIn",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -1331,7 +1249,7 @@
 			"label": "usesCtagPool",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1342,7 +1260,7 @@
 			"label": "hasPinterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1353,7 +1271,7 @@
 			"label": "hasLAGinterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1364,7 +1282,7 @@
 			"label": "hasFlavor",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -1375,30 +1293,18 @@
 			"label": "hasImage",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
 		},
 		{
 			"from": "vserver",
-			"to": "ipaddress",
-			"label": "hasIpAddress",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
-			"from": "vserver",
 			"to": "l-interface",
 			"label": "hasLInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1409,8 +1315,7 @@
 			"label": "runsOnPserver",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -1421,8 +1326,7 @@
 			"label": "hasVolume",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1433,8 +1337,7 @@
 			"label": "hosts",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1445,7 +1348,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1456,8 +1359,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1468,7 +1370,7 @@
 			"label": "hasMetaData",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1479,7 +1381,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1490,8 +1392,7 @@
 			"label": "dependsOn",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1502,8 +1403,7 @@
 			"label": "dependsOn",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1514,7 +1414,7 @@
 			"label": "contains",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1525,7 +1425,7 @@
 			"label": "hasMetaData",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1536,8 +1436,7 @@
 			"label": "contains",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1548,7 +1447,7 @@
 			"label": "bridgedTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1559,7 +1458,7 @@
 			"label": "bridgedTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -1570,8 +1469,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1582,7 +1480,7 @@
 			"label": "existsIn",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -1593,7 +1491,7 @@
 			"label": "belongsTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1604,8 +1502,7 @@
 			"label": "hasVigServer",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1616,8 +1513,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1628,7 +1524,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1639,7 +1535,7 @@
 			"label": "isPartOf",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1650,7 +1546,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1661,7 +1557,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "${direction}"
@@ -1672,7 +1568,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1683,7 +1579,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1694,7 +1590,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1705,7 +1601,7 @@
 			"label": "usesLogicalLink",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1716,7 +1612,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1727,7 +1623,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1738,7 +1634,7 @@
 			"label": "isPartOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1749,7 +1645,7 @@
 			"label": "isPartOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1760,7 +1656,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1771,7 +1667,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1782,7 +1678,7 @@
 			"label": "isPartOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1793,7 +1689,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1804,7 +1700,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1815,7 +1711,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2One",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1826,7 +1722,7 @@
 			"label": "existsIn",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1837,7 +1733,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -1848,7 +1744,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1859,7 +1755,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1870,7 +1766,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1881,29 +1777,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
-			"from": "vpe",
-			"to": "entitlement",
-			"label": "has",
-			"direction": "OUT",
-			"multiplicity": "One2Many",
-			"contains": "${direction}",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
-			"from": "vpe",
-			"to": "license",
-			"label": "has",
-			"direction": "OUT",
-			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1914,7 +1788,7 @@
 			"label": "existsIn",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -1925,7 +1799,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1936,7 +1810,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
index 01e1e670..9bcf4b76 100644
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
@@ -1,2028 +1,1940 @@
-{"rules":
-[
 {
-	"from" : "availability-zone",
-	"to" : "complex",
-	"label" : "groupsResourcesIn",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "license-key-resource",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "availability-zone",
-	"to" : "service-capability",
-	"label" : "supportsServiceCapability",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "cloud-region",
-	"to" : "complex",
-	"label" : "locatedIn",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "cloud-region",
-	"to" : "l3-network",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "cloud-region",
-	"to" : "tenant",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "reverse"
-},
-{
-	"from" : "cloud-region",
-	"to" : "image",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "cloud-region",
-	"to" : "flavor",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "cloud-region",
-	"to" : "availability-zone",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "cloud-region",
-	"to" : "oam-network",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "cloud-region",
-	"to" : "dvs-switch",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "cloud-region",
-	"to" : "volume-group",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "cloud-region",
-	"to" : "group-assignment",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "cloud-region",
-	"to" : "snapshot",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "cloud-region",
-	"to" : "zone",
-	"label" : "isMemberOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "complex",
-	"to" : "ctag-pool",
-	"label" : "hasCtagPool",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "complex",
-	"to" : "l3-network",
-	"label" : "usesL3Network",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "ctag-pool",
-	"to" : "availability-zone",
-	"label" : "supportsAvailabilityZone",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "customer",
-	"to" : "service-subscription",
-	"label" : "subscribesTo",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "reverse"
-},
-{
-	"from" : "dvs-switch",
-	"to" : "availability-zone",
-	"label" : "existsIn",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "l-interface",
-	"label" : "hasLInterface",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "availability-zone",
-	"label" : "hasAvailabilityZone",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "lag-interface",
-	"label" : "hasLAGInterface",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "l3-network",
-	"label" : "usesL3Network",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "pserver",
-	"label" : "runsOnPserver",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "vnf-image",
-	"label" : "usesVnfImage",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "vserver",
-	"label" : "runsOnVserver",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "service-instance",
-	"label" : "hasInstance",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "site-pair-set",
-	"label" : "hasSitePairSet",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "network-profile",
-	"label" : "hasNetworkProfile",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "pnf",
-	"label" : "hostedOn",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "group-assignment",
-	"to" : "tenant",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "group-assignment",
-	"to" : "pserver",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "image",
-	"to" : "metadata",
-	"label" : "hasMetaData",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "image",
-	"to" : "metadatum",
-	"label" : "hasMetaDatum",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "l-interface",
-	"to" : "instance-group",
-	"label" : "isMemberOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "vnfc",
-	"to" : "instance-group",
-	"label" : "isMemberOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "l-interface",
-	"to" : "l3-interface-ipv4-address-list",
-	"label" : "hasIpAddress",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "l-interface",
-	"to" : "l3-interface-ipv6-address-list",
-	"label" : "hasIpAddress",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "l-interface",
-	"to" : "l-interface",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "l-interface",
-	"to" : "logical-link",
-	"label" : "usesLogicalLink",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "true",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "lag-interface",
-	"to" : "logical-link",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "true",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "l-interface",
-	"to" : "vlan",
-	"label" : "hasVlan",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "l-interface",
-	"to" : "sriov-vf",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2One",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "l3-interface-ipv4-address-list",
-	"to" : "instance-group",
-	"label" : "isMemberOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "l3-interface-ipv6-address-list",
-	"to" : "instance-group",
-	"label" : "isMemberOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "l3-interface-ipv4-address-list",
-	"to" : "l3-network",
-	"label" : "isMemberOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "l3-interface-ipv6-address-list",
-	"to" : "l3-network",
-	"label" : "isMemberOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "l3-interface-ipv4-address-list",
-	"to" : "subnet",
-	"label" : "isMemberOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "l3-interface-ipv6-address-list",
-	"to" : "subnet",
-	"label" : "isMemberOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "l3-network",
-	"to" : "vpn-binding",
-	"label" : "usesVpnBinding",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "l3-network",
-	"to" : "instance-group",
-	"label" : "memberOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "l3-network",
-	"to" : "subnet",
-	"label" : "hasSubnet",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "reverse"
-},
-{
-	"from" : "l3-network",
-	"to" : "service-instance",
-	"label" : "hasInstance",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "reverse"
-},
-{
-	"from" : "l3-network",
-	"to" : "ctag-assignment",
-	"label" : "hasCtagAssignment",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "l3-network",
-	"to" : "network-policy",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "l3-network",
-	"to" : "segmentation-assignment",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "l3-network",
-	"to" : "route-table-reference",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "lag-interface",
-	"to" : "lag-link",
-	"label" : "usesLAGLink",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "true",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "lag-interface",
-	"to" : "p-interface",
-	"label" : "usesPInterface",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "lag-interface",
-	"to" : "l-interface",
-	"label" : "hasLInterface",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "logical-link",
-	"to" : "lag-link",
-	"label" : "usesLAGLink",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "logical-link",
-	"to" : "pnf",
-	"label" : "bridgedTo",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "logical-link",
-	"to" : "logical-link",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "model",
-	"to" : "model-ver",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "model-ver",
-	"to" : "model-element",
-	"label" : "startsWith",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "model-element",
-	"to" : "model-ver",
-	"label" : "isA",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "model-ver",
-	"to" : "metadatum",
-	"label" : "hasMetaData",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "model-element",
-	"to" : "model-element",
-	"label" : "connectsTo",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "model-element",
-	"to" : "model-constraint",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "model-element",
-	"to" : "constrained-element-set",
-	"label" : "connectsTo",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "model-constraint",
-	"to" : "constrained-element-set",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "constrained-element-set",
-	"to" : "element-choice-set",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "element-choice-set",
-	"to" : "model-element",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "named-query",
-	"to" : "model",
-	"label" : "relatedTo",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "named-query",
-	"to" : "named-query-element",
-	"label" : "startsWith",
-	"direction" : "OUT",
-	"multiplicity" : "One2One",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "named-query-element",
-	"to" : "named-query-element",
-	"label" : "connectsTo",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "named-query-element",
-	"to" : "model",
-	"label" : "isA",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "named-query-element",
-	"to" : "property-constraint",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "named-query-element",
-	"to" : "related-lookup",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "instance-group",
-	"to" : "model",
-	"label" : "targets",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "newvce",
-	"to" : "l-interface",
-	"label" : "hasLInterface",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "oam-network",
-	"to" : "complex",
-	"label" : "definedFor",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "oam-network",
-	"to" : "service-capability",
-	"label" : "supportsServiceCapability",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "p-interface",
-	"to" : "l-interface",
-	"label" : "hasLInterface",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "p-interface",
-	"to" : "physical-link",
-	"label" : "usesPhysicalLink",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "true",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "p-interface",
-	"to" : "logical-link",
-	"label" : "usesLogicalLink",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "port-group",
-	"to" : "cvlan-tag",
-	"label" : "hasCTag",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "pserver",
-	"to" : "complex",
-	"label" : "locatedIn",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "pserver",
-	"to" : "cloud-region",
-	"label" : "locatedIn",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "pserver",
-	"to" : "availability-zone",
-	"label" : "existsIn",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "pserver",
-	"to" : "lag-interface",
-	"label" : "hasLAGInterface",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "pserver",
-	"to" : "p-interface",
-	"label" : "hasPinterface",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "pserver",
-	"to" : "zone",
-	"label" : "isMemberOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "pnf",
-	"to" : "p-interface",
-	"label" : "hasPinterface",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "pnf",
-	"to" : "lag-interface",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "pnf",
-	"to" : "complex",
-	"label" : "locatedIn",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "pnf",
-	"to" : "instance-group",
-	"label" : "isMemberOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "pnf",
-	"to" : "zone",
-	"label" : "isMemberOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "service-instance",
-	"to" : "zone",
-	"label" : "locatedIn",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "service-instance",
-	"to" : "cvlan-tag",
-	"label" : "hasIPAGFacingVLAN",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "service-instance",
-	"to" : "pnf",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "service-subscription",
-	"to" : "service-instance",
-	"label" : "hasInstance",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "reverse"
-},
-{
-	"from" : "site-pair-set",
-	"to" : "routing-instance",
-	"label" : "hasRoutingInstance",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "routing-instance",
-	"to" : "site-pair",
-	"label" : "hasSitePair",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "site-pair",
-	"to" : "class-of-service",
-	"label" : "hasClassOfService",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "tenant",
-	"to" : "l3-network",
-	"label" : "usesL3Network",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "tenant",
-	"to" : "service-subscription",
-	"label" : "relatedTo",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "tenant",
-	"to" : "vserver",
-	"label" : "owns",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "reverse"
-},
-{
-	"from" : "vce",
-	"to" : "availability-zone",
-	"label" : "hasAvailabilityZone",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "vce",
-	"to" : "complex",
-	"label" : "locatedIn",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "vce",
-	"to" : "port-group",
-	"label" : "hasPortGroup",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "vce",
-	"to" : "vserver",
-	"label" : "runsOnVserver",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "vce",
-	"to" : "service-instance",
-	"label" : "hasServiceInstance",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "reverse"
-},
-{
-	"from" : "virtual-data-center",
-	"to" : "generic-vnf",
-	"label" : "hasVNF",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "reverse"
-},
-{
-	"from" : "vlan",
-	"to" : "l3-interface-ipv4-address-list",
-	"label" : "hasIpAddress",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "vlan",
-	"to" : "l3-interface-ipv6-address-list",
-	"label" : "hasIpAddress",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "vpe",
-	"to" : "complex",
-	"label" : "locatedIn",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "vpe",
-	"to" : "ctag-pool",
-	"label" : "usesCtagPool",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "vpe",
-	"to" : "l-interface",
-	"label" : "hasLInterface",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "vpe",
-	"to" : "lag-interface",
-	"label" : "hasLAGInterface",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "vpe",
-	"to" : "vserver",
-	"label" : "runsOnVserver",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "vpls-pe",
-	"to" : "complex",
-	"label" : "locatedIn",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "vpls-pe",
-	"to" : "ctag-pool",
-	"label" : "usesCtagPool",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "vpls-pe",
-	"to" : "p-interface",
-	"label" : "hasPinterface",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "vpls-pe",
-	"to" : "lag-interface",
-	"label" : "hasLAGinterface",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "vserver",
-	"to" : "flavor",
-	"label" : "hasFlavor",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "vserver",
-	"to" : "image",
-	"label" : "hasImage",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "vserver",
-	"to" : "ipaddress",
-	"label" : "hasIpAddress",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "vserver",
-	"to" : "l-interface",
-	"label" : "hasLInterface",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "vserver",
-	"to" : "pserver",
-	"label" : "runsOnPserver",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "vserver",
-	"to" : "volume",
-	"label" : "hasVolume",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "vserver",
-	"to" : "vnfc",
-	"label" : "hosts",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "vserver",
-	"to" : "snapshot",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "One2One",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "service-instance",
-	"to" : "connector",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "service-instance",
-	"to" : "metadatum",
-	"label" : "hasMetaData",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "service-instance",
-	"to" : "logical-link",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "true",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "service-instance",
-	"to" : "vlan",
-	"label" : "dependsOn",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "service-instance",
-	"to" : "service-instance",
-	"label" : "dependsOn",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "connector",
-	"to" : "virtual-data-center",
-	"label" : "contains",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "connector",
-	"to" : "metadatum",
-	"label" : "hasMetaData",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "virtual-data-center",
-	"to" : "logical-link",
-	"label" : "contains",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "logical-link",
-	"to" : "generic-vnf",
-	"label" : "bridgedTo",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "logical-link",
-	"to" : "pserver",
-	"label" : "bridgedTo",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "vlan",
-	"to" : "multicast-configuration",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "volume-group",
-	"to" : "complex",
-	"label" : "existsIn",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "volume-group",
-	"to" : "tenant",
-	"label" : "belongsTo",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "ipsec-configuration",
-	"to" : "vig-server",
-	"label" : "hasVigServer",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "ipsec-configuration",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "vf-module",
-	"to" : "volume-group",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "One2One",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "vserver",
-	"to" : "vf-module",
-	"label" : "isPartOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "vf-module",
-	"to" : "l3-network",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "vf-module",
-	"to" : "vnfc",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "true",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "vf-module",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "volume-group",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "vnfc",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "true",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "vlan",
-	"to" : "logical-link",
-	"label" : "usesLogicalLink",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "true",
-	"SVC-INFRA" : "true"
-},
-{
-	"from" : "vpn-binding",
-	"to" : "route-target",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "service-instance",
-	"to" : "ctag-assignment",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "allotted-resource",
-	"to" : "generic-vnf",
-	"label" : "isPartOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "allotted-resource",
-	"to" : "l3-network",
-	"label" : "isPartOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "allotted-resource",
-	"to" : "instance-group",
-	"label" : "isMemberOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "allotted-resource",
-	"to" : "network-policy",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "One2One",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "allotted-resource",
-	"to" : "vlan",
-	"label" : "isPartOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "allotted-resource",
-	"to" : "l-interface",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "instance-group",
-	"label" : "isMemberOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "service-instance",
-	"to" : "instance-group",
-	"label" : "isMemberOf",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "allotted-resource",
-	"to" : "tunnel-xconnect",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2One",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "logical-link",
-	"to" : "cloud-region",
-	"label" : "existsIn",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "logical-link",
-	"to" : "vpn-binding",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "entitlement",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "license",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "vce",
-	"to" : "entitlement",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "vce",
-	"to" : "license",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "vpe",
-	"to" : "entitlement",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "vpe",
-	"to" : "license",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "zone",
-	"to" : "complex",
-	"label" : "existsIn",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "service-instance",
-	"to" : "allotted-resource",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "service-instance",
-	"to" : "allotted-resource",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "allotted-resource",
-	"to" : "vpn-binding",
-	"label" : "belongsTo",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "complex",
-	"label" : "locatedIn",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "generic-vnf",
-	"to" : "ctag-pool",
-	"label" : "usesCtagPool",
-	"direction" : "OUT",
-	"multiplicity" : "Many2Many",
-	"isParent" : "false",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "p-interface",
-	"to" : "sriov-pf",
-	"label" : "has",
-	"direction" : "OUT",
-	"multiplicity" : "One2One",
-	"isParent" : "true",
-	"usesResource" : "false",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
-},
-{
-	"from" : "sriov-vf",
-	"to" : "sriov-pf",
-	"label" : "uses",
-	"direction" : "OUT",
-	"multiplicity" : "Many2One",
-	"isParent" : "false",
-	"usesResource" : "true",
-	"hasDelTarget" : "false",
-	"SVC-INFRA" : "false"
+	"rules": [
+		{
+			"from": "availability-zone",
+			"to": "complex",
+			"label": "groupsResourcesIn",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "license-key-resource",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "availability-zone",
+			"to": "service-capability",
+			"label": "supportsServiceCapability",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "cloud-region",
+			"to": "complex",
+			"label": "locatedIn",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "cloud-region",
+			"to": "l3-network",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "cloud-region",
+			"to": "tenant",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "!${direction}",
+			"prevent-delete": "${direction}"
+		},
+		{
+			"from": "cloud-region",
+			"to": "image",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}"
+		},
+		{
+			"from": "cloud-region",
+			"to": "flavor",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}"
+		},
+		{
+			"from": "cloud-region",
+			"to": "availability-zone",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}"
+		},
+		{
+			"from": "cloud-region",
+			"to": "oam-network",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}"
+		},
+		{
+			"from": "cloud-region",
+			"to": "dvs-switch",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}"
+		},
+		{
+			"from": "cloud-region",
+			"to": "volume-group",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}"
+		},
+		{
+			"from": "cloud-region",
+			"to": "group-assignment",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}"
+		},
+		{
+			"from": "cloud-region",
+			"to": "snapshot",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}"
+		},
+		{
+			"from": "cloud-region",
+			"to": "zone",
+			"label": "isMemberOf",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "complex",
+			"to": "ctag-pool",
+			"label": "hasCtagPool",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "complex",
+			"to": "l3-network",
+			"label": "usesL3Network",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "ctag-pool",
+			"to": "availability-zone",
+			"label": "supportsAvailabilityZone",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "customer",
+			"to": "service-subscription",
+			"label": "subscribesTo",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "!${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "dvs-switch",
+			"to": "availability-zone",
+			"label": "existsIn",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "l-interface",
+			"label": "hasLInterface",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "availability-zone",
+			"label": "hasAvailabilityZone",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "lag-interface",
+			"label": "hasLAGInterface",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "l3-network",
+			"label": "usesL3Network",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "pserver",
+			"label": "runsOnPserver",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "vnf-image",
+			"label": "usesVnfImage",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "vserver",
+			"label": "runsOnVserver",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "service-instance",
+			"label": "hasInstance",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "site-pair-set",
+			"label": "hasSitePairSet",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "network-profile",
+			"label": "hasNetworkProfile",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "pnf",
+			"label": "hostedOn",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "group-assignment",
+			"to": "tenant",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "group-assignment",
+			"to": "pserver",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "image",
+			"to": "metadatum",
+			"label": "hasMetaDatum",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l-interface",
+			"to": "instance-group",
+			"label": "isMemberOf",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vnfc",
+			"to": "instance-group",
+			"label": "isMemberOf",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l-interface",
+			"to": "l3-interface-ipv4-address-list",
+			"label": "hasIpAddress",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l-interface",
+			"to": "l3-interface-ipv6-address-list",
+			"label": "hasIpAddress",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l-interface",
+			"to": "l-interface",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l-interface",
+			"to": "logical-link",
+			"label": "usesLogicalLink",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "lag-interface",
+			"to": "logical-link",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l-interface",
+			"to": "vlan",
+			"label": "hasVlan",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l-interface",
+			"to": "sriov-vf",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2One",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l3-interface-ipv4-address-list",
+			"to": "instance-group",
+			"label": "isMemberOf",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l3-interface-ipv6-address-list",
+			"to": "instance-group",
+			"label": "isMemberOf",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l3-interface-ipv4-address-list",
+			"to": "l3-network",
+			"label": "isMemberOf",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l3-interface-ipv6-address-list",
+			"to": "l3-network",
+			"label": "isMemberOf",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l3-interface-ipv4-address-list",
+			"to": "subnet",
+			"label": "isMemberOf",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l3-interface-ipv6-address-list",
+			"to": "subnet",
+			"label": "isMemberOf",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l3-network",
+			"to": "vpn-binding",
+			"label": "usesVpnBinding",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "l3-network",
+			"to": "instance-group",
+			"label": "memberOf",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l3-network",
+			"to": "subnet",
+			"label": "hasSubnet",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "!${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l3-network",
+			"to": "service-instance",
+			"label": "hasInstance",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "!${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l3-network",
+			"to": "ctag-assignment",
+			"label": "hasCtagAssignment",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l3-network",
+			"to": "network-policy",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l3-network",
+			"to": "segmentation-assignment",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "l3-network",
+			"to": "route-table-reference",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "lag-interface",
+			"to": "lag-link",
+			"label": "usesLAGLink",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "lag-interface",
+			"to": "p-interface",
+			"label": "usesPInterface",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "lag-interface",
+			"to": "l-interface",
+			"label": "hasLInterface",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "logical-link",
+			"to": "lag-link",
+			"label": "usesLAGLink",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "logical-link",
+			"to": "pnf",
+			"label": "bridgedTo",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "logical-link",
+			"to": "logical-link",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "model",
+			"to": "model-ver",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "model-ver",
+			"to": "model-element",
+			"label": "startsWith",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "model-element",
+			"to": "model-ver",
+			"label": "isA",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "model-ver",
+			"to": "metadatum",
+			"label": "hasMetaData",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "model-element",
+			"to": "model-element",
+			"label": "connectsTo",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "model-element",
+			"to": "model-constraint",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "model-element",
+			"to": "constrained-element-set",
+			"label": "connectsTo",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "model-constraint",
+			"to": "constrained-element-set",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "constrained-element-set",
+			"to": "element-choice-set",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "element-choice-set",
+			"to": "model-element",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "named-query",
+			"to": "model",
+			"label": "relatedTo",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "named-query",
+			"to": "named-query-element",
+			"label": "startsWith",
+			"direction": "OUT",
+			"multiplicity": "One2One",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "named-query-element",
+			"to": "named-query-element",
+			"label": "connectsTo",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "named-query-element",
+			"to": "model",
+			"label": "isA",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "named-query-element",
+			"to": "property-constraint",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "named-query-element",
+			"to": "related-lookup",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "instance-group",
+			"to": "model",
+			"label": "targets",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "newvce",
+			"to": "l-interface",
+			"label": "hasLInterface",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "oam-network",
+			"to": "complex",
+			"label": "definedFor",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "oam-network",
+			"to": "service-capability",
+			"label": "supportsServiceCapability",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "p-interface",
+			"to": "l-interface",
+			"label": "hasLInterface",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "p-interface",
+			"to": "physical-link",
+			"label": "usesPhysicalLink",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "p-interface",
+			"to": "logical-link",
+			"label": "usesLogicalLink",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "port-group",
+			"to": "cvlan-tag",
+			"label": "hasCTag",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "pserver",
+			"to": "complex",
+			"label": "locatedIn",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "pserver",
+			"to": "cloud-region",
+			"label": "locatedIn",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "pserver",
+			"to": "availability-zone",
+			"label": "existsIn",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "pserver",
+			"to": "lag-interface",
+			"label": "hasLAGInterface",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "pserver",
+			"to": "p-interface",
+			"label": "hasPinterface",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "pserver",
+			"to": "zone",
+			"label": "isMemberOf",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "pnf",
+			"to": "p-interface",
+			"label": "hasPinterface",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "pnf",
+			"to": "lag-interface",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "pnf",
+			"to": "complex",
+			"label": "locatedIn",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "pnf",
+			"to": "instance-group",
+			"label": "isMemberOf",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "pnf",
+			"to": "zone",
+			"label": "isMemberOf",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "service-instance",
+			"to": "zone",
+			"label": "locatedIn",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "service-instance",
+			"to": "cvlan-tag",
+			"label": "hasIPAGFacingVLAN",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "service-instance",
+			"to": "pnf",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "service-subscription",
+			"to": "service-instance",
+			"label": "hasInstance",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "!${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "site-pair-set",
+			"to": "routing-instance",
+			"label": "hasRoutingInstance",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "routing-instance",
+			"to": "site-pair",
+			"label": "hasSitePair",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "site-pair",
+			"to": "class-of-service",
+			"label": "hasClassOfService",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "tenant",
+			"to": "l3-network",
+			"label": "usesL3Network",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "tenant",
+			"to": "service-subscription",
+			"label": "relatedTo",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "tenant",
+			"to": "vserver",
+			"label": "owns",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "!${direction}",
+			"prevent-delete": "${direction}"
+		},
+		{
+			"from": "vce",
+			"to": "availability-zone",
+			"label": "hasAvailabilityZone",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "vce",
+			"to": "complex",
+			"label": "locatedIn",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "vce",
+			"to": "port-group",
+			"label": "hasPortGroup",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vce",
+			"to": "vserver",
+			"label": "runsOnVserver",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vce",
+			"to": "service-instance",
+			"label": "hasServiceInstance",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "!${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "virtual-data-center",
+			"to": "generic-vnf",
+			"label": "hasVNF",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "!${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vlan",
+			"to": "l3-interface-ipv4-address-list",
+			"label": "hasIpAddress",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vlan",
+			"to": "l3-interface-ipv6-address-list",
+			"label": "hasIpAddress",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vpls-pe",
+			"to": "complex",
+			"label": "locatedIn",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "vpls-pe",
+			"to": "ctag-pool",
+			"label": "usesCtagPool",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vpls-pe",
+			"to": "p-interface",
+			"label": "hasPinterface",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vpls-pe",
+			"to": "lag-interface",
+			"label": "hasLAGinterface",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vserver",
+			"to": "flavor",
+			"label": "hasFlavor",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "vserver",
+			"to": "image",
+			"label": "hasImage",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "vserver",
+			"to": "l-interface",
+			"label": "hasLInterface",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vserver",
+			"to": "pserver",
+			"label": "runsOnPserver",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "vserver",
+			"to": "volume",
+			"label": "hasVolume",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vserver",
+			"to": "vnfc",
+			"label": "hosts",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vserver",
+			"to": "snapshot",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "One2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "service-instance",
+			"to": "connector",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "service-instance",
+			"to": "metadatum",
+			"label": "hasMetaData",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "service-instance",
+			"to": "logical-link",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "service-instance",
+			"to": "vlan",
+			"label": "dependsOn",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "service-instance",
+			"to": "service-instance",
+			"label": "dependsOn",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "connector",
+			"to": "virtual-data-center",
+			"label": "contains",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "connector",
+			"to": "metadatum",
+			"label": "hasMetaData",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "virtual-data-center",
+			"to": "logical-link",
+			"label": "contains",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "logical-link",
+			"to": "generic-vnf",
+			"label": "bridgedTo",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "logical-link",
+			"to": "pserver",
+			"label": "bridgedTo",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "vlan",
+			"to": "multicast-configuration",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "volume-group",
+			"to": "complex",
+			"label": "existsIn",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "volume-group",
+			"to": "tenant",
+			"label": "belongsTo",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "ipsec-configuration",
+			"to": "vig-server",
+			"label": "hasVigServer",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "ipsec-configuration",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vf-module",
+			"to": "volume-group",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "One2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vserver",
+			"to": "vf-module",
+			"label": "isPartOf",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vf-module",
+			"to": "l3-network",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vf-module",
+			"to": "vnfc",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "${direction}"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "vf-module",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "volume-group",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "vnfc",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vlan",
+			"to": "logical-link",
+			"label": "usesLogicalLink",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vpn-binding",
+			"to": "route-target",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "service-instance",
+			"to": "ctag-assignment",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "allotted-resource",
+			"to": "generic-vnf",
+			"label": "isPartOf",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "allotted-resource",
+			"to": "l3-network",
+			"label": "isPartOf",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "allotted-resource",
+			"to": "instance-group",
+			"label": "isMemberOf",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "allotted-resource",
+			"to": "network-policy",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "One2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "allotted-resource",
+			"to": "vlan",
+			"label": "isPartOf",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "allotted-resource",
+			"to": "l-interface",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "instance-group",
+			"label": "isMemberOf",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "service-instance",
+			"to": "instance-group",
+			"label": "isMemberOf",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "allotted-resource",
+			"to": "tunnel-xconnect",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2One",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "logical-link",
+			"to": "cloud-region",
+			"label": "existsIn",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "logical-link",
+			"to": "vpn-binding",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "entitlement",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "license",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vce",
+			"to": "entitlement",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "vce",
+			"to": "license",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "zone",
+			"to": "complex",
+			"label": "existsIn",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "service-instance",
+			"to": "allotted-resource",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "service-instance",
+			"to": "allotted-resource",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "allotted-resource",
+			"to": "vpn-binding",
+			"label": "belongsTo",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "allotted-resource",
+			"to": "allotted-resource",
+			"label": "bindsTo",
+			"direction": "OUT",
+			"multiplicity": "One2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "complex",
+			"label": "locatedIn",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "ctag-pool",
+			"label": "usesCtagPool",
+			"direction": "OUT",
+			"multiplicity": "Many2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "p-interface",
+			"to": "sriov-pf",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2One",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "sriov-vf",
+			"to": "sriov-pf",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		}
+	]
 }
-]
-}
\ No newline at end of file
diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v8.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v8.json
index 75f86295..d8f33b3e 100644
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v8.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v8.json
@@ -6,7 +6,7 @@
 			"label": "groupsResourcesIn",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -17,7 +17,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -28,7 +28,7 @@
 			"label": "supportsServiceCapability",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -39,7 +39,7 @@
 			"label": "locatedIn",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -50,7 +50,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -61,7 +61,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "${direction}"
@@ -72,7 +72,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -83,7 +83,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -94,7 +94,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -105,7 +105,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -116,7 +116,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -127,8 +127,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -139,7 +138,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -150,7 +149,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -161,7 +160,7 @@
 			"label": "hasCtagPool",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -172,7 +171,7 @@
 			"label": "usesL3Network",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -183,7 +182,7 @@
 			"label": "supportsAvailabilityZone",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -194,7 +193,7 @@
 			"label": "subscribesTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "NONE"
@@ -205,7 +204,7 @@
 			"label": "existsIn",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -216,7 +215,7 @@
 			"label": "hasLInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -227,7 +226,7 @@
 			"label": "hasAvailabilityZone",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -238,7 +237,7 @@
 			"label": "hasLAGInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -249,8 +248,7 @@
 			"label": "usesL3Network",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -261,8 +259,7 @@
 			"label": "runsOnPserver",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -273,7 +270,7 @@
 			"label": "usesVnfImage",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -284,8 +281,7 @@
 			"label": "runsOnVserver",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -296,8 +292,7 @@
 			"label": "hasInstance",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -308,7 +303,7 @@
 			"label": "hasSitePairSet",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -319,7 +314,7 @@
 			"label": "hasNetworkProfile",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -330,7 +325,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -341,29 +336,18 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
 		},
 		{
 			"from": "image",
-			"to": "metadata",
-			"label": "hasMetaData",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
-			"from": "image",
 			"to": "metadatum",
 			"label": "hasMetaDatum",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -374,7 +358,7 @@
 			"label": "hasIpAddress",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -385,7 +369,7 @@
 			"label": "hasIpAddress",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -396,7 +380,7 @@
 			"label": "usesLogicalLink",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -407,7 +391,7 @@
 			"label": "hasVlan",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -418,7 +402,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2One",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -429,7 +413,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -440,7 +424,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -451,10 +435,10 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
-			"prevent-delete": "!${direction}"
+			"prevent-delete": "NONE"
 		},
 		{
 			"from": "l3-interface-ipv6-address-list",
@@ -462,10 +446,10 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
-			"prevent-delete": "!${direction}"
+			"prevent-delete": "NONE"
 		},
 		{
 			"from": "l3-network",
@@ -473,7 +457,7 @@
 			"label": "usesVpnBinding",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -484,7 +468,7 @@
 			"label": "hasSubnet",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "NONE"
@@ -495,7 +479,7 @@
 			"label": "hasInstance",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "NONE"
@@ -506,7 +490,7 @@
 			"label": "hasCtagAssignment",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -517,7 +501,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -528,7 +512,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -539,7 +523,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -550,8 +534,7 @@
 			"label": "usesLAGLink",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -562,8 +545,7 @@
 			"label": "usesPInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -574,7 +556,7 @@
 			"label": "hasLInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -585,8 +567,7 @@
 			"label": "usesLAGLink",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -597,7 +578,7 @@
 			"label": "bridgedTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -608,7 +589,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -619,7 +600,7 @@
 			"label": "startsWith",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -630,7 +611,7 @@
 			"label": "isA",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -641,7 +622,7 @@
 			"label": "hasMetaData",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -652,7 +633,7 @@
 			"label": "connectsTo",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -663,7 +644,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -674,7 +655,7 @@
 			"label": "connectsTo",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -685,7 +666,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -696,7 +677,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -707,7 +688,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -718,7 +699,7 @@
 			"label": "relatedTo",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -729,7 +710,7 @@
 			"label": "startsWith",
 			"direction": "OUT",
 			"multiplicity": "One2One",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -740,7 +721,7 @@
 			"label": "connectsTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -751,7 +732,7 @@
 			"label": "isA",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -762,7 +743,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -773,7 +754,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -784,7 +765,7 @@
 			"label": "hasLInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -795,7 +776,7 @@
 			"label": "definedFor",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -806,7 +787,7 @@
 			"label": "supportsServiceCapability",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -817,7 +798,7 @@
 			"label": "hasLInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -828,7 +809,7 @@
 			"label": "usesPhysicalLink",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -839,7 +820,7 @@
 			"label": "usesLogicalLink",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -850,8 +831,7 @@
 			"label": "hasCTag",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -862,7 +842,7 @@
 			"label": "locatedIn",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -873,7 +853,7 @@
 			"label": "locatedIn",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -884,7 +864,7 @@
 			"label": "existsIn",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -895,7 +875,7 @@
 			"label": "hasLAGInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -906,8 +886,7 @@
 			"label": "hasPinterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -918,8 +897,7 @@
 			"label": "hasPinterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -930,7 +908,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -941,7 +919,7 @@
 			"label": "locatedIn",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -952,8 +930,7 @@
 			"label": "hasIPAGFacingVLAN",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -964,7 +941,7 @@
 			"label": "hasInstance",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "NONE"
@@ -975,7 +952,7 @@
 			"label": "hasRoutingInstance",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -986,7 +963,7 @@
 			"label": "hasSitePair",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -997,7 +974,7 @@
 			"label": "hasClassOfService",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1008,7 +985,7 @@
 			"label": "usesL3Network",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1019,7 +996,7 @@
 			"label": "relatedTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1030,7 +1007,7 @@
 			"label": "owns",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "${direction}"
@@ -1041,7 +1018,7 @@
 			"label": "hasAvailabilityZone",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -1052,7 +1029,7 @@
 			"label": "locatedIn",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -1063,8 +1040,7 @@
 			"label": "hasPortGroup",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1075,8 +1051,7 @@
 			"label": "runsOnVserver",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1087,7 +1062,7 @@
 			"label": "hasServiceInstance",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "NONE"
@@ -1098,7 +1073,7 @@
 			"label": "hasVNF",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "NONE"
@@ -1109,7 +1084,7 @@
 			"label": "hasIpAddress",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1120,74 +1095,18 @@
 			"label": "hasIpAddress",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
 		},
 		{
-			"from": "vpe",
-			"to": "complex",
-			"label": "locatedIn",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "!${direction}"
-		},
-		{
-			"from": "vpe",
-			"to": "ctag-pool",
-			"label": "usesCtagPool",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
-			"from": "vpe",
-			"to": "l-interface",
-			"label": "hasLInterface",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
-			"from": "vpe",
-			"to": "lag-interface",
-			"label": "hasLAGInterface",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
-			"from": "vpe",
-			"to": "vserver",
-			"label": "runsOnVserver",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
 			"from": "vpls-pe",
 			"to": "complex",
 			"label": "locatedIn",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -1198,7 +1117,7 @@
 			"label": "usesCtagPool",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1209,7 +1128,7 @@
 			"label": "hasPinterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1220,7 +1139,7 @@
 			"label": "hasLAGinterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1231,7 +1150,7 @@
 			"label": "hasFlavor",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -1242,30 +1161,18 @@
 			"label": "hasImage",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
 		},
 		{
 			"from": "vserver",
-			"to": "ipaddress",
-			"label": "hasIpAddress",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
-			"from": "vserver",
 			"to": "l-interface",
 			"label": "hasLInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1276,8 +1183,7 @@
 			"label": "runsOnPserver",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -1288,8 +1194,7 @@
 			"label": "hasVolume",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1300,8 +1205,7 @@
 			"label": "hosts",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1312,7 +1216,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1323,8 +1227,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1335,7 +1238,7 @@
 			"label": "hasMetaData",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1346,7 +1249,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1357,8 +1260,7 @@
 			"label": "dependsOn",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1369,8 +1271,7 @@
 			"label": "dependsOn",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1381,7 +1282,7 @@
 			"label": "contains",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1392,7 +1293,7 @@
 			"label": "hasMetaData",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1403,8 +1304,7 @@
 			"label": "contains",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1415,7 +1315,7 @@
 			"label": "bridgedTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1426,7 +1326,7 @@
 			"label": "bridgedTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -1437,8 +1337,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1449,7 +1348,7 @@
 			"label": "existsIn",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -1460,7 +1359,7 @@
 			"label": "belongsTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1471,8 +1370,7 @@
 			"label": "hasVigServer",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1483,8 +1381,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1495,7 +1392,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1506,7 +1403,7 @@
 			"label": "isPartOf",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1517,7 +1414,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1528,7 +1425,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "${direction}"
@@ -1539,7 +1436,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1550,7 +1447,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1561,7 +1458,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1572,7 +1469,7 @@
 			"label": "usesLogicalLink",
 			"direction": "OUT",
 			"multiplicity": "One2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v9.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v9.json
index 41c9b1b8..80096274 100644
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v9.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v9.json
@@ -6,7 +6,7 @@
 			"label": "groupsResourcesIn",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -17,7 +17,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -28,7 +28,7 @@
 			"label": "supportsServiceCapability",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -39,7 +39,7 @@
 			"label": "locatedIn",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -50,7 +50,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -61,7 +61,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "${direction}"
@@ -72,7 +72,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -83,7 +83,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -94,7 +94,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -105,7 +105,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -116,7 +116,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -127,8 +127,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -139,7 +138,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -150,7 +149,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}"
@@ -161,7 +160,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -172,7 +171,7 @@
 			"label": "hasCtagPool",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -183,7 +182,7 @@
 			"label": "usesL3Network",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -194,7 +193,7 @@
 			"label": "supportsAvailabilityZone",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -205,7 +204,7 @@
 			"label": "subscribesTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "NONE"
@@ -216,7 +215,7 @@
 			"label": "existsIn",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -227,7 +226,7 @@
 			"label": "hasLInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -238,7 +237,7 @@
 			"label": "hasAvailabilityZone",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -249,7 +248,7 @@
 			"label": "hasLAGInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -260,8 +259,7 @@
 			"label": "usesL3Network",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -272,8 +270,7 @@
 			"label": "runsOnPserver",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -284,7 +281,7 @@
 			"label": "usesVnfImage",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -295,8 +292,7 @@
 			"label": "runsOnVserver",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -307,8 +303,7 @@
 			"label": "hasInstance",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -319,7 +314,7 @@
 			"label": "hasSitePairSet",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -330,7 +325,7 @@
 			"label": "hasNetworkProfile",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -341,7 +336,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -352,29 +347,18 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
 		},
 		{
 			"from": "image",
-			"to": "metadata",
-			"label": "hasMetaData",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
-			"from": "image",
 			"to": "metadatum",
 			"label": "hasMetaDatum",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -385,7 +369,7 @@
 			"label": "hasIpAddress",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -396,7 +380,7 @@
 			"label": "hasIpAddress",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -407,7 +391,7 @@
 			"label": "usesLogicalLink",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -418,7 +402,7 @@
 			"label": "hasVlan",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -429,7 +413,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2One",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -440,7 +424,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -451,7 +435,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -462,10 +446,10 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
-			"prevent-delete": "!${direction}"
+			"prevent-delete": "NONE"
 		},
 		{
 			"from": "l3-interface-ipv6-address-list",
@@ -473,10 +457,10 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
-			"prevent-delete": "!${direction}"
+			"prevent-delete": "NONE"
 		},
 		{
 			"from": "l3-network",
@@ -484,7 +468,7 @@
 			"label": "usesVpnBinding",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -495,7 +479,7 @@
 			"label": "hasSubnet",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "NONE"
@@ -506,7 +490,7 @@
 			"label": "hasInstance",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "NONE"
@@ -517,7 +501,7 @@
 			"label": "hasCtagAssignment",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -528,7 +512,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -539,7 +523,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -550,7 +534,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -561,8 +545,7 @@
 			"label": "usesLAGLink",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -573,8 +556,7 @@
 			"label": "usesPInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -585,7 +567,7 @@
 			"label": "hasLInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -596,8 +578,7 @@
 			"label": "usesLAGLink",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -608,7 +589,7 @@
 			"label": "bridgedTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -619,7 +600,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -630,7 +611,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -641,7 +622,7 @@
 			"label": "startsWith",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -652,7 +633,7 @@
 			"label": "isA",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -663,7 +644,7 @@
 			"label": "hasMetaData",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -674,7 +655,7 @@
 			"label": "connectsTo",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -685,7 +666,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -696,7 +677,7 @@
 			"label": "connectsTo",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -707,7 +688,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -718,7 +699,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -729,7 +710,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -740,7 +721,7 @@
 			"label": "relatedTo",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -751,7 +732,7 @@
 			"label": "startsWith",
 			"direction": "OUT",
 			"multiplicity": "One2One",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -762,7 +743,7 @@
 			"label": "connectsTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -773,7 +754,7 @@
 			"label": "isA",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -784,7 +765,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -795,7 +776,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -806,7 +787,7 @@
 			"label": "targets",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -817,7 +798,7 @@
 			"label": "hasLInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -828,7 +809,7 @@
 			"label": "definedFor",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -839,7 +820,7 @@
 			"label": "supportsServiceCapability",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -850,7 +831,7 @@
 			"label": "hasLInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -861,7 +842,7 @@
 			"label": "usesPhysicalLink",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -872,7 +853,7 @@
 			"label": "usesLogicalLink",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -883,8 +864,7 @@
 			"label": "hasCTag",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -895,7 +875,7 @@
 			"label": "locatedIn",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -906,7 +886,7 @@
 			"label": "locatedIn",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -917,7 +897,7 @@
 			"label": "existsIn",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -928,7 +908,7 @@
 			"label": "hasLAGInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -939,8 +919,7 @@
 			"label": "hasPinterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -951,7 +930,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -962,8 +941,7 @@
 			"label": "hasPinterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -974,7 +952,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -985,7 +963,7 @@
 			"label": "locatedIn",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -996,7 +974,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1007,7 +985,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1018,8 +996,7 @@
 			"label": "hasIPAGFacingVLAN",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1030,8 +1007,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1042,7 +1018,7 @@
 			"label": "hasInstance",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "NONE"
@@ -1053,7 +1029,7 @@
 			"label": "hasRoutingInstance",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1064,7 +1040,7 @@
 			"label": "hasSitePair",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1075,7 +1051,7 @@
 			"label": "hasClassOfService",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1086,7 +1062,7 @@
 			"label": "usesL3Network",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1097,7 +1073,7 @@
 			"label": "relatedTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1108,7 +1084,7 @@
 			"label": "owns",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "${direction}"
@@ -1119,7 +1095,7 @@
 			"label": "hasAvailabilityZone",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -1130,7 +1106,7 @@
 			"label": "locatedIn",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -1141,8 +1117,7 @@
 			"label": "hasPortGroup",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1153,8 +1128,7 @@
 			"label": "runsOnVserver",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1165,7 +1139,7 @@
 			"label": "hasServiceInstance",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "NONE"
@@ -1176,7 +1150,7 @@
 			"label": "hasVNF",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "NONE"
@@ -1187,7 +1161,7 @@
 			"label": "hasIpAddress",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1198,74 +1172,18 @@
 			"label": "hasIpAddress",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
 		},
 		{
-			"from": "vpe",
-			"to": "complex",
-			"label": "locatedIn",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "!${direction}"
-		},
-		{
-			"from": "vpe",
-			"to": "ctag-pool",
-			"label": "usesCtagPool",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
-			"from": "vpe",
-			"to": "l-interface",
-			"label": "hasLInterface",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
-			"from": "vpe",
-			"to": "lag-interface",
-			"label": "hasLAGInterface",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
-			"from": "vpe",
-			"to": "vserver",
-			"label": "runsOnVserver",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
 			"from": "vpls-pe",
 			"to": "complex",
 			"label": "locatedIn",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -1276,7 +1194,7 @@
 			"label": "usesCtagPool",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1287,7 +1205,7 @@
 			"label": "hasPinterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1298,7 +1216,7 @@
 			"label": "hasLAGinterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1309,7 +1227,7 @@
 			"label": "hasFlavor",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -1320,30 +1238,18 @@
 			"label": "hasImage",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
 		},
 		{
 			"from": "vserver",
-			"to": "ipaddress",
-			"label": "hasIpAddress",
-			"direction": "OUT",
-			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
-			"from": "vserver",
 			"to": "l-interface",
 			"label": "hasLInterface",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1354,8 +1260,7 @@
 			"label": "runsOnPserver",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -1366,8 +1271,7 @@
 			"label": "hasVolume",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1378,8 +1282,7 @@
 			"label": "hosts",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1390,7 +1293,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1401,8 +1304,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1413,7 +1315,7 @@
 			"label": "hasMetaData",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1424,7 +1326,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1435,8 +1337,7 @@
 			"label": "dependsOn",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1447,8 +1348,7 @@
 			"label": "dependsOn",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1459,7 +1359,7 @@
 			"label": "contains",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1470,7 +1370,7 @@
 			"label": "hasMetaData",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1481,8 +1381,7 @@
 			"label": "contains",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1493,7 +1392,7 @@
 			"label": "bridgedTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1504,7 +1403,7 @@
 			"label": "bridgedTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -1515,8 +1414,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1527,7 +1425,7 @@
 			"label": "existsIn",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}"
@@ -1538,7 +1436,7 @@
 			"label": "belongsTo",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1549,8 +1447,7 @@
 			"label": "hasVigServer",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
-			"uses-resource": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1561,8 +1458,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
-			"uses-resource": "${direction}",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1573,7 +1469,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1584,7 +1480,7 @@
 			"label": "isPartOf",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1595,7 +1491,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1606,7 +1502,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "${direction}"
@@ -1617,7 +1513,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1628,7 +1524,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1639,7 +1535,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1650,7 +1546,7 @@
 			"label": "usesLogicalLink",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE"
@@ -1661,7 +1557,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1672,7 +1568,7 @@
 			"label": "isPartOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1683,7 +1579,7 @@
 			"label": "isPartOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1694,7 +1590,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1705,7 +1601,7 @@
 			"label": "isPartOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1716,7 +1612,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1727,7 +1623,7 @@
 			"label": "isMemberOf",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1738,7 +1634,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2One",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1749,7 +1645,7 @@
 			"label": "existsIn",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1760,7 +1656,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -1771,7 +1667,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1782,7 +1678,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1793,7 +1689,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1804,29 +1700,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "One2Many",
-			"contains": "${direction}",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
-			"from": "vpe",
-			"to": "entitlement",
-			"label": "has",
-			"direction": "OUT",
-			"multiplicity": "One2Many",
-			"contains": "${direction}",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE"
-		},
-		{
-			"from": "vpe",
-			"to": "license",
-			"label": "has",
-			"direction": "OUT",
-			"multiplicity": "One2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1837,7 +1711,7 @@
 			"label": "existsIn",
 			"direction": "OUT",
 			"multiplicity": "Many2One",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
@@ -1848,7 +1722,7 @@
 			"label": "has",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "${direction}",
+			"contains-other-v": "${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
@@ -1859,7 +1733,7 @@
 			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
-			"contains": "NONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"