diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml
index 203786b014857a6702223b0a73362d46759373ac..048d434e6906a1a0972271d97b0882740eae75a3 100644
--- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml
+++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml
@@ -924,14 +924,6 @@ definitions:
           The identifier of the resource in the scope of the VIM or the
           resource provider.
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim"
-      vnfLinkPort:
-        description: >
-          Externally provided link ports to be used to connect VNFC connection points to this externally-managed VL
-          on this network resource. If this attribute is not present, the VNFM shall create the link ports on the
-          externally-managed VL.
-        type: array
-        items:
-          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfLinkPortData"
 
   ExtManagedVirtualLinkInfo:
     type: object
@@ -1195,12 +1187,6 @@ definitions:
           (for new and modified resources) or has been (for removed
           resources) available from the VIM.
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
-      resourceDefinitionId:
-        description: >
-          The identifier of the "ResourceDefinition" in the granting exchange
-          related to the LCM operation occurrence. It shall be present when
-          an applicable GrantInfo for thegranted resource exists. See note.
-        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierLocal"
       metadata:
         description: >
           Metadata about this resource.
@@ -1513,7 +1499,7 @@ definitions:
               received it due to an error or a wrongly configured subscription filter.
             type: array
             items:
-              $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedExtLinkPort"
+              $ref: "#/definitions/AffectedExtLinkPort"
           affectedVirtualStorages:
             description: >
               Information about virtualised storage instances that were affected
@@ -1531,7 +1517,7 @@ definitions:
           This allows the NFVO to obtain the information contained in the
           latest "result" notification if it has not received it due to an
           error or a wrongly configured subscription filter.
-        $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInfoModifications"
+        $ref: "#/definitions/VnfInfoModifications"
       changedExtConnectivity:
         description: >
           Information about changed external connectivity, if applicable.
@@ -1602,4 +1588,124 @@ definitions:
             description: >
               Link to the VNF snapshot resource, if the VNF LCM operation occurrence is related to a VNF snapshot.
               Shall be present if operation="CREATE_SNAPSHOT" or operation="REVERT_TO_SNAPSHOT".
-            $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
\ No newline at end of file
+            $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
+
+  AffectedExtLinkPort:
+    description: >
+      This type provides information about added and deleted external link ports (link ports attached to external virtual links).
+    type: object
+    required:
+      - id
+      - changeType
+      - extCpInstanceId
+      - resourceHandle
+    properties:
+      id:
+        description: >
+          Identifier of the link port, identifying the applicable "extLinkPorts" entry in the "ExtVirtualLinkInfo" data
+          type (see clause 5.5.3.2).
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      changeType:
+        description: >
+          Signals the type of change.
+          Permitted values:
+          -	ADDED
+          -	REMOVED
+        type: string
+        enum:
+          - ADDED
+          - REMOVED
+      extCpInstanceId:
+        description: >
+          Identifier of the related external CP instance.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
+      resourceHandle:
+        description: >
+          Reference to the link port resource.
+          Detailed information is (for added resources) or has been (for removed resources) available from the VIM.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
+
+  VnfInfoModifications:
+    description: >
+      This type represents attribute modifications that were performed on an
+      "Individual VNF instance" resource. The attributes that can be included
+      consist of those requested to be modified explicitly in the
+      "VnfInfoModificationRequest" data structure, and additional attributes
+      of the "VnfInstance" data structure that were modified implicitly e.g.
+      when modifying the referenced VNF package.
+    type: object
+    properties:
+      vnfInstanceName:
+        description: >
+          If present, this attribute signals modifications of the
+          "vnfInstanceName" attribute in "VnfInstance".
+        type: string
+      vnfInstanceDescription:
+        description: >
+          If present, this attribute signals modifications of the
+          "vnfInstanceDescription" attribute in "VnfInstance".
+        type: string
+      vnfConfigurableProperties:
+        description: >
+          If present, this attribute signals modifications of the
+          "vnfConfigurableProperties" attribute in "VnfInstance".
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
+      metadata:
+        description: >
+          If present, this attribute signals modifications of the "metadata"
+          attribute in "VnfInstance".
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
+      extensions:
+        description: >
+          If present, this attribute signals modifications of the "extensions"
+          attribute in "VnfInstance".
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
+      vnfdId:
+        description: >
+          If present, this attribute signals modifications of the "vnfdId"
+          attribute in "VnfInstance".
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      vnfProvider:
+        description: >
+          If present, this attribute signals modifications of the
+          "vnfProvider" attribute in "VnfInstance".
+          If present, this attribute (which depends on the value of the
+          "vnfPkgId" attribute) was modified implicitly following a request to
+          modify the "vnfPkgId" attribute, by copying the value of this
+          attribute from the VNFD in the VNF Package identified by the
+          "vnfPkgId” attribute.
+        type: string
+      vnfProductName:
+        description: >
+          If present, this attribute signals modifications of the
+          "vnfProductName" attribute in "VnfInstance".
+          If present, this attribute (which depends on the value of the
+          "vnfPkgId" attribute) was modified implicitly following a request to
+          modify the "vnfPkgId" attribute, by copying the value of this
+          attribute from the VNFD in the VNF Package identified by the
+          "vnfPkgId” attribute.
+        type: string
+      vnfSoftwareVersion:
+        description: >
+          If present, this attribute signals modifications of the
+          "vnfSoftwareVersion" attribute in "VnfInstance".
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version"
+      vnfdVersion:
+        description: >
+          If present, this attribute signals modifications of the
+          "vnfdVersion" attribute in "VnfInstance".
+          If present, this attribute (which depends on the value of the
+          "vnfdId" attribute) was modified implicitly following a request to
+          modify the "vnfdId" attribute, by copying the value of this
+          attribute from the VNFD in the VNF Package identified by the
+          "vnfdId” attribute.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version"
+      vnfcInfoModifications:
+        description: >
+          If present, this attribute signals modifications of certain
+          entries in the "vnfcInfo" attribute array in the
+          "instantiatedVnfInfo" attribute of "VnfInstance", as defined
+          in clause 5.5.2.12
+        type: array
+        items:
+          $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfcInfoModifications"
\ No newline at end of file
diff --git a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml
index 04aedb1a831dd26f0b1eccb9574d743d1af5d9d6..ede11200416ae1095eeaf073f14f372a84af0c59 100644
--- a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml
+++ b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml
@@ -428,7 +428,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/Alarm"
+            $ref: "./definitions/SOL003VNFFaultManagement_def.yaml#/definitions/Alarm"
     
     IndividualAlarm.Get.200:
       description: |
@@ -460,7 +460,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/Alarm"
+            $ref: "./definitions/SOL003VNFFaultManagement_def.yaml#/definitions/Alarm"
     
     IndividualAlarm.Patch.200:
       description: |
diff --git a/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml b/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ec87ccafedc37124d9ebcd9f49d293066ab6e107
--- /dev/null
+++ b/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml
@@ -0,0 +1,115 @@
+definitions:
+  Alarm:
+    description: >
+      The alarm data type encapsulates information about an alarm.
+    type: object
+    required:
+      - id
+      - managedObjectId
+      - alarmRaisedTime
+      - ackState
+      - perceivedSeverity
+      - eventTime
+      - eventType
+      - probableCause
+      - isRootCause
+      - _links
+    properties:
+      id:
+        description: >
+          Identifier of this Alarm information element.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      managedObjectId:
+        description: >
+          Identifier of the affected VNF instance.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      rootCauseFaultyResource:
+        description: >
+          The virtualised resources that are causing the VNF fault.
+          Shall be present if the alarm affects virtualised resources.
+        $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FaultyResourceInfo"
+      alarmRaisedTime:
+        description: >
+          Time stamp indicating when the alarm is raised by the managed
+          object.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
+      alarmChangedTime:
+        description: >
+          Time stamp indicating when the alarm was last changed. It shall be
+          present if the alarm has been updated.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
+      alarmClearedTime:
+        description: >
+          Time stamp indicating when the alarm was cleared. It shall be
+          present if the alarm has been cleared.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
+      alarmAcknowledgedTime:
+        description: >
+          Time stamp indicating when the alarm was acknowledged.
+          It shall be present if the alarm has been acknowledged.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
+      ackState:
+        description: >
+          Acknowledgement state of the alarm.
+          Permitted values:
+          * UNACKNOWLEDGED
+          * ACKNOWLEDGED.
+        type: string
+        enum:
+          - UNACKNOWLEDGED
+          - ACKNOWLEDGED
+      perceivedSeverity:
+        description: >
+          Perceived severity of the managed object failure.
+        $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/PerceivedSeverityType"
+      eventTime:
+        description: >
+          Time stamp indicating when the fault was observed.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
+      eventType:
+        description: >
+          Type of event.
+        $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/EventType"
+      faultType:
+        description: >
+          Additional information to clarify the type of the fault.
+        type: string
+      probableCause:
+        description: >
+          Information about the probable cause of the fault.
+        type: string
+      isRootCause:
+        description: >
+          Attribute indicating if this fault is the root for other correlated
+          alarms. If true, then the alarms listed in the attribute
+          "correlatedAlarmIds" are caused by this fault.
+        type: boolean
+      correlatedAlarmIds:
+        description: >
+          List of identifiers of other alarms correlated to this fault.
+        type: array
+        items:
+          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      faultDetails:
+        description: >
+          Provides additional information about the fault.
+        type: array
+        items:
+          type: string
+      _links:
+        description: >
+          Links for this resource.
+        type: object
+        required:
+          - self
+        properties:
+          self:
+            description: >
+              URI of this resource.
+            $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
+          objectInstance:
+            description: >
+              Link to the resource representing the VNF instance to which the
+              notified alarm is correlated. Shall be present if the VNF
+              instance information is accessible as a resource.
+            $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
\ No newline at end of file
diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml
index 1a07c8b2f7ad79b2ad318d427deddb80dbb9b53d..31dd81a1d47a33a676f0c0d31dbb7583e7cdbfa8 100644
--- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml
+++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml
@@ -40,7 +40,7 @@ definitions:
           multi-site VL instance (refer to clause 4.4.1.12).
         type: array
         items:
-          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtManagedVirtualLinkData"
+          $ref: "#/definitions/ExtManagedVirtualLinkData"
       vimConnectionInfo:
         description: >
           Information about VIM connections to be used for managing the resources for the VNF instance, or refer to
@@ -77,6 +77,59 @@ definitions:
           handling configurable properties during the operation are defined in clause 5.4.4.3.1.
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
 
+  ExtManagedVirtualLinkData:
+    type: object
+    required:
+      - id
+      - vnfVirtualLinkDescId
+      - resourceId
+    properties:
+      id:
+        description: >
+          The identifier of the externally-managed internal VL instance. The
+          identifier is assigned by the NFV-MANO entity that manages this VL
+          instance.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      vnfVirtualLinkDescId:
+        description: >
+          The identifier of the VLD in the VNFD for this VL.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd"
+      vimConnectionId:
+        description: >
+          Identifier of the VIM connection to manage this resource. This
+          attribute shall only be supported and present if VNF-related
+          resource management in direct mode is applicable.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      resourceProviderId:
+        description: >
+          Identifies the entity responsible for the management of this
+          resource. This attribute shall only be supported and present if
+          VNF-related resource management in indirect mode is applicable. The
+          identification scheme is outside the scope of the present document.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      resourceId:
+        description: >
+          The identifier of the resource in the scope of the VIM or the
+          resource provider.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim"
+      vnfLinkPort:
+        description: >
+          Externally provided link ports to be used to connect VNFC connection points to this externally-managed VL
+          on this network resource. If this attribute is not present, the VNFM shall create the link ports on the
+          externally-managed VL.
+        type: array
+        items:
+          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfLinkPortData"
+      extManagedMultisiteVirtualLinkId:
+        description: >
+          Identifier of the externally-managed multi-site VL instance. The identifier is assigned by the NFVMANO
+          entity that manages the externally managed multi-site VL instance. It shall be present when the present
+          externally-managed internal VL (indicated by extManagedVirtualLinkId) is part of a multi-site VL, e.g.,
+          in support of multi-site VNF spanning several VIMs. All externally-managed internal VL instances
+          corresponding to an internal VL created based on the same virtualLinkDescId shall refer to the same
+          extManagedMultisiteVirtualLinkId.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+
   ChangeVnfFlavourRequest:
     #SOL003 location: 5.5.2.7
     description: >
@@ -118,7 +171,7 @@ definitions:
           multi-site VL instance (refer to clause 4.4.1.12).
         type: array
         items:
-          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtManagedVirtualLinkData"
+          $ref: "#/definitions/ExtManagedVirtualLinkData"
       vimConnectionInfo:
         description: >
           Information about VIM connections to be used for managing the resources for the VNF instance, or refer to
@@ -318,7 +371,7 @@ definitions:
           instance (refer to clause 4.4.1.12).
         type: array
         items:
-          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtManagedVirtualLinkData"
+          $ref: "#/definitions/ExtManagedVirtualLinkData"
       vimConnectionInfo:
         description: >
           Information about VIM connections to be used for managing the resources for the VNF instance, or refer to 
@@ -772,7 +825,7 @@ definitions:
               VL instance (refer to clause 5.5.3.3).
             type: array
             items:
-              $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ExtManagedVirtualLinkInfo"
+              $ref: "#/definitions/ExtManagedVirtualLinkInfo"
           monitoringParameters:
             description: >
               Active monitoring parameters.
@@ -806,7 +859,7 @@ definitions:
               Information on the virtualised storage resource(s) used as storage for the VNF instance.
             type: array
             items:
-              $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VirtualStorageResourceInfo"
+              $ref: "#/definitions/VirtualStorageResourceInfo"
       metadata:
         description: >
           Additional VNF-specific attributes that provide metadata describing the VNF instance.
@@ -934,6 +987,94 @@ definitions:
               this VNF instance resource (i.e., VNF instance is in INSTANTIATED state).
             $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
 
+  ExtManagedVirtualLinkInfo:
+    type: object
+    required:
+      - id
+      - vnfVirtualLinkDescId
+      - networkResource
+    properties:
+      id:
+        description: >
+          Identifier of the externally-managed internal VL and the related
+          externally-managed VL information instance.
+          The identifier is assigned by the NFV-MANO entity that manages this
+          VL instance.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      vnfVirtualLinkDescId:
+        description: >
+          Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
+      vnfdId:
+        description: >
+          Identifier of the VNFD.
+          Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change
+          current VNF package" operation or due to its final failure).
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      networkResource:
+        description: >
+          Reference to the VirtualNetwork resource providing this VL.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
+      vnfLinkPorts:
+        description: >
+          Link ports of this VL.
+        type: array
+        items:
+          $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfLinkPortInfo"
+      extManagedMultisiteVirtualLinkId:
+        description: >
+          Identifier of the externally-managed multi-site VL instance. The identifier is assigned by the NFVMANO entity
+          that manages the externally managed multi-site VL instance. It shall be present when the externally-managed
+          internal VL is part of a multi-site VL, e.g., in support of multi-site VNF spanning several VIMs.
+          All externally-managed internal VL instances corresponding to an internal VL created based on the same
+          virtualLinkDescId shall refer to the same extManagedMultisiteVirtualLinkId.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+
+  VirtualStorageResourceInfo:
+    description: >
+      This type represents the information that allows addressing a virtualised
+      resource that is used by a VNF instance.
+    type: object
+    required:
+      - id
+      - virtualStorageDescId
+      - storageResource
+    properties:
+      id:
+        description: >
+          Identifier of this VirtualStorageResourceInfo instance.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
+      virtualStorageDescId:
+        description: >
+          Identifier of the VirtualStorageDesc in the VNFD.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd"
+      vnfdId:
+        description: >
+          Identifier of the VNFD.
+          Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change
+          current VNF package" operation or due to its final failure).
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      storageResource:
+        description: >
+          Reference to the VirtualStorage resource.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
+      zoneId:
+        description: >
+          The identifier of the resource zone, as managed by the resource
+          management layer (typically, the VIM), where the referenced
+          VirtualStorage resource is placed. Shall be provided if this
+          information is available from the VIM.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      reservationId:
+        description: >
+          The reservation identifier applicable to the resource. It shall be
+          present when an applicable reservation exists.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      metadata:
+        description: >
+          Metadata about this resource.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
+
   VnfcResourceInfo:
     description: >
       This type represents the information on virtualised compute and storage
@@ -1532,7 +1673,7 @@ definitions:
               received it due to an error or a wrongly configured subscription filter.
             type: array
             items:
-              $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedExtLinkPort"
+              $ref: "#/definitions/AffectedExtLinkPort"
           affectedVirtualStorages:
             description: >
               Information about virtualised storage instances that were affected
@@ -1550,7 +1691,7 @@ definitions:
           This allows the NFVO to obtain the information contained in the
           latest "result" notification if it has not received it due to an
           error or a wrongly configured subscription filter.
-        $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInfoModifications"
+        $ref: "#/definitions/VnfInfoModifications"
       changedExtConnectivity:
         description: >
           Information about changed external connectivity, if applicable.
@@ -1623,6 +1764,50 @@ definitions:
               Shall be present if operation="CREATE_SNAPSHOT" or operation="REVERT_TO_SNAPSHOT".
             $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
 
+  AffectedExtLinkPort:
+    description: >
+      This type provides information about added and deleted external link ports (link ports attached to external virtual links).
+    type: object
+    required:
+      - id
+      - changeType
+      - extCpInstanceId
+      - resourceHandle
+    properties:
+      id:
+        description: >
+          Identifier of the link port, identifying the applicable "extLinkPorts" entry in the "ExtVirtualLinkInfo" data
+          type (see clause 5.5.3.2).
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      changeType:
+        description: >
+          Signals the type of change.
+          Permitted values:
+          -	ADDED
+          -	REMOVED
+        type: string
+        enum:
+          - ADDED
+          - REMOVED
+      extCpInstanceId:
+        description: >
+          Identifier of the related external CP instance.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
+      resourceHandle:
+        description: >
+          Reference to the link port resource.
+          Detailed information is (for added resources) or has been (for removed resources) available from the VIM.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
+      resourceDefinitionId:
+        description: >
+          The identifier of the "ResourceDefinition" in the granting exchange related to the LCM operation occurrence.
+          It shall be present when an applicable GrantInfo for the granted resource exists.
+          The "resourceDefinitionId" attribute provides information to the API consumer (i.e. the NFVO) to assist in
+          correlating the resource changes performed during the LCM operation with the granted resources in a
+          specific Grant exchange, which is identified by the "grantId" available in the "Individual VNF lifecycle
+          management operation occurrence" and the "id" in the "Individual Grant".
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierLocal"
+
   VnfLcmOperationOccurrenceNotification:
     description: >
       This type represents a VNF lifecycle management operation occurrence
@@ -1787,7 +1972,7 @@ definitions:
           for that operation occurrence.
         type: array
         items:
-          $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedExtLinkPort"
+          $ref: "#/definitions/AffectedExtLinkPort"
       affectedVirtualStorages:
         description: >
           Information about virtualised storage instances that were affected
@@ -1810,7 +1995,7 @@ definitions:
           "verbosity" attribute is set to "FULL" and the operation has performed
           any changes to VNF instance information, including VNF configurable
           properties. Shall be absent otherwise.
-        $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInfoModifications"
+        $ref: "#/definitions/VnfInfoModifications"
       changedExtConnectivity:
         description: >
           Information about changed external connectivity, if this notification
diff --git a/src/definitions/SOL002SOL003VNFFaultManagement_def.yaml b/src/definitions/SOL002SOL003VNFFaultManagement_def.yaml
index 653786dae646c77dfb7c0ce4106c86b5fe90745f..3c93b3956ae4affba34246d5cfa62882636c7ceb 100644
--- a/src/definitions/SOL002SOL003VNFFaultManagement_def.yaml
+++ b/src/definitions/SOL002SOL003VNFFaultManagement_def.yaml
@@ -65,127 +65,6 @@ definitions:
               URI of this resource.
             $ref: "SOL002SOL003_def.yaml#/definitions/Link"
 
-  Alarm:
-    description: >
-      The alarm data type encapsulates information about an alarm.
-    type: object
-    required:
-      - id
-      - managedObjectId
-      - alarmRaisedTime
-      - ackState
-      - perceivedSeverity
-      - eventTime
-      - eventType
-      - probableCause
-      - isRootCause
-      - _links
-    properties:
-      id:
-        description: >
-          Identifier of this Alarm information element.
-        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
-      managedObjectId:
-        description: >
-          Identifier of the affected VNF instance.
-        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
-      vnfcInstanceIds:
-        description: >
-          Identifiers of the affected VNFC instances.
-        type: array
-        items:
-          $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
-      rootCauseFaultyResource:
-        description: >
-          The virtualised resources that are causing the VNF fault.
-          Shall be present if the alarm affects virtualised resources.
-        $ref: "#/definitions/FaultyResourceInfo"
-      alarmRaisedTime:
-        description: >
-          Time stamp indicating when the alarm is raised by the managed
-          object.
-        $ref: "SOL002SOL003_def.yaml#/definitions/DateTime"
-      alarmChangedTime:
-        description: >
-          Time stamp indicating when the alarm was last changed. It shall be
-          present if the alarm has been updated.
-        $ref: "SOL002SOL003_def.yaml#/definitions/DateTime"
-      alarmClearedTime:
-        description: >
-          Time stamp indicating when the alarm was cleared. It shall be
-          present if the alarm has been cleared.
-        $ref: "SOL002SOL003_def.yaml#/definitions/DateTime"
-      alarmAcknowledgedTime:
-        description: >
-          Time stamp indicating when the alarm was acknowledged.
-          It shall be present if the alarm has been acknowledged.
-        $ref: "SOL002SOL003_def.yaml#/definitions/DateTime"
-      ackState:
-        description: >
-          Acknowledgement state of the alarm.
-          Permitted values:
-          * UNACKNOWLEDGED
-          * ACKNOWLEDGED.
-        type: string
-        enum:
-          - UNACKNOWLEDGED
-          - ACKNOWLEDGED
-      perceivedSeverity:
-        description: >
-          Perceived severity of the managed object failure.
-        $ref: "#/definitions/PerceivedSeverityType"
-      eventTime:
-        description: >
-          Time stamp indicating when the fault was observed.
-        $ref: "SOL002SOL003_def.yaml#/definitions/DateTime"
-      eventType:
-        description: >
-          Type of event.
-        $ref: "#/definitions/EventType"
-      faultType:
-        description: >
-          Additional information to clarify the type of the fault.
-        type: string
-      probableCause:
-        description: >
-          Information about the probable cause of the fault.
-        type: string
-      isRootCause:
-        description: >
-          Attribute indicating if this fault is the root for other correlated
-          alarms. If true, then the alarms listed in the attribute
-          "correlatedAlarmIds" are caused by this fault.
-        type: boolean
-      correlatedAlarmIds:
-        description: >
-          List of identifiers of other alarms correlated to this fault.
-        type: array
-        items:
-          $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
-      faultDetails:
-        description: >
-          Provides additional information about the fault.
-        type: array
-        items:
-          type: string
-      _links:
-        description: >
-          Links for this resource.
-        type: object
-        required:
-          - self
-        properties:
-          self:
-            description: >
-              URI of this resource.
-            $ref: "SOL002SOL003_def.yaml#/definitions/Link"
-          objectInstance:
-            description: >
-              Link to the resource representing the VNF instance to which the
-              notified alarm is correlated. Shall be present if the VNF
-              instance information is accessible as a resource.
-            $ref: "SOL002SOL003_def.yaml#/definitions/Link"
-
   AlarmNotification:
     description: >
       This type represents an alarm notification about VNF faults.
diff --git a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml
index a1744ca977354f6de3f3e0ead6110500c3c7f242..637afa64f62ae777e116d3ad164b0911becdb69d 100644
--- a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml
+++ b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml
@@ -152,91 +152,6 @@ definitions:
         items:
           $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
 
-  VnfInfoModifications:
-    description: >
-      This type represents attribute modifications that were performed on an
-      "Individual VNF instance" resource. The attributes that can be included
-      consist of those requested to be modified explicitly in the
-      "VnfInfoModificationRequest" data structure, and additional attributes
-      of the "VnfInstance" data structure that were modified implicitly e.g.
-      when modifying the referenced VNF package.
-    type: object
-    properties:
-      vnfInstanceName:
-        description: >
-          If present, this attribute signals modifications of the
-          "vnfInstanceName" attribute in "VnfInstance".
-        type: string
-      vnfInstanceDescription:
-        description: >
-          If present, this attribute signals modifications of the
-          "vnfInstanceDescription" attribute in "VnfInstance".
-        type: string
-      vnfConfigurableProperties:
-        description: >
-          If present, this attribute signals modifications of the
-          "vnfConfigurableProperties" attribute in "VnfInstance".
-        $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
-      metadata:
-        description: >
-          If present, this attribute signals modifications of the "metadata"
-          attribute in "VnfInstance".
-        $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
-      extensions:
-        description: >
-          If present, this attribute signals modifications of the "extensions"
-          attribute in "VnfInstance".
-        $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
-      vnfdId:
-        description: >
-          If present, this attribute signals modifications of the "vnfdId"
-          attribute in "VnfInstance".
-        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
-      vnfProvider:
-        description: >
-          If present, this attribute signals modifications of the
-          "vnfProvider" attribute in "VnfInstance".
-          If present, this attribute (which depends on the value of the
-          "vnfPkgId" attribute) was modified implicitly following a request to
-          modify the "vnfPkgId" attribute, by copying the value of this
-          attribute from the VNFD in the VNF Package identified by the
-          "vnfPkgId” attribute.
-        type: string
-      vnfProductName:
-        description: >
-          If present, this attribute signals modifications of the
-          "vnfProductName" attribute in "VnfInstance".
-          If present, this attribute (which depends on the value of the
-          "vnfPkgId" attribute) was modified implicitly following a request to
-          modify the "vnfPkgId" attribute, by copying the value of this
-          attribute from the VNFD in the VNF Package identified by the
-          "vnfPkgId” attribute.
-        type: string
-      vnfSoftwareVersion:
-        description: >
-          If present, this attribute signals modifications of the
-          "vnfSoftwareVersion" attribute in "VnfInstance".
-        $ref: "SOL002SOL003_def.yaml#/definitions/Version"
-      vnfdVersion:
-        description: >
-          If present, this attribute signals modifications of the
-          "vnfdVersion" attribute in "VnfInstance".
-          If present, this attribute (which depends on the value of the
-          "vnfdId" attribute) was modified implicitly following a request to
-          modify the "vnfdId" attribute, by copying the value of this
-          attribute from the VNFD in the VNF Package identified by the
-          "vnfdId” attribute.
-        $ref: "SOL002SOL003_def.yaml#/definitions/Version"
-      vnfcInfoModifications:
-        description: >
-          If present, this attribute signals modifications of certain
-          entries in the "vnfcInfo" attribute array in the
-          "instantiatedVnfInfo" attribute of "VnfInstance", as defined
-          in clause 5.5.2.12
-        type: array
-        items:
-          $ref: "#/definitions/VnfcInfoModifications"
-
   CancelMode:
     description: >
       This type represents a parameter to select the mode of cancelling an
@@ -363,49 +278,6 @@ definitions:
         items:
           $ref: "SOL002SOL003_def.yaml#/definitions/VnfExtCpData"
 
-  ExtManagedVirtualLinkInfo:
-    type: object
-    required:
-      - id
-      - vnfVirtualLinkDescId
-      - networkResource
-    properties:
-      id:
-        description: >
-          Identifier of the externally-managed internal VL and the related
-          externally-managed VL information instance.
-          The identifier is assigned by the NFV-MANO entity that manages this
-          VL instance.
-        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
-      vnfVirtualLinkDescId:
-        description: >
-          Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD.
-        $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
-      vnfdId:
-        description: >
-          Identifier of the VNFD.
-          Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change
-          current VNF package" operation or due to its final failure).
-        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
-      networkResource:
-        description: >
-          Reference to the VirtualNetwork resource providing this VL.
-        $ref: "SOL002SOL003_def.yaml#/definitions/ResourceHandle"
-      vnfLinkPorts:
-        description: >
-          Link ports of this VL.
-        type: array
-        items:
-          $ref: "#/definitions/VnfLinkPortInfo"
-      extManagedMultisiteVirtualLinkId:
-        description: >
-          Identifier of the externally-managed multi-site VL instance. The identifier is assigned by the NFVMANO entity 
-          that manages the externally managed multi-site VL instance. It shall be present when the externally-managed 
-          internal VL is part of a multi-site VL, e.g., in support of multi-site VNF spanning several VIMs. 
-          All externally-managed internal VL instances corresponding to an internal VL created based on the same 
-          virtualLinkDescId shall refer to the same extManagedMultisiteVirtualLinkId.
-        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
-
   ScaleInfo:
     required:
       - aspectId
@@ -428,51 +300,6 @@ definitions:
           maximum value shall be <= maxScaleLevel as described in the VNFD.
         type: integer
 
-  VirtualStorageResourceInfo:
-    description: >
-      This type represents the information that allows addressing a virtualised
-      resource that is used by a VNF instance.
-    type: object
-    required:
-      - id
-      - virtualStorageDescId
-      - storageResource
-    properties:
-      id:
-        description: >
-          Identifier of this VirtualStorageResourceInfo instance.
-        $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
-      virtualStorageDescId:
-        description: >
-          Identifier of the VirtualStorageDesc in the VNFD.
-        $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd"
-      vnfdId:
-        description: >
-          Identifier of the VNFD.
-          Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change
-          current VNF package" operation or due to its final failure).
-        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
-      storageResource:
-        description: >
-          Reference to the VirtualStorage resource.
-        $ref: "SOL002SOL003_def.yaml#/definitions/ResourceHandle"
-      zoneId:
-        description: >
-          The identifier of the resource zone, as managed by the resource
-          management layer (typically, the VIM), where the referenced
-          VirtualStorage resource is placed. Shall be provided if this
-          information is available from the VIM.
-        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
-      reservationId:
-        description: >
-          The reservation identifier applicable to the resource. It shall be
-          present when an applicable reservation exists.
-        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
-      metadata:
-        description: >
-          Metadata about this resource.
-        $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
-
   VnfLinkPortInfo:
     type: object
     required:
@@ -743,50 +570,6 @@ definitions:
         items:
           $ref: "#/definitions/LcmOperationStateType"
 
-  AffectedExtLinkPort:
-    description: >
-      This type provides information about added and deleted external link ports (link ports attached to external virtual links).
-    type: object
-    required:
-      - id
-      - changeType
-      - extCpInstanceId
-      - resourceHandle
-    properties:
-      id:
-        description: >
-          Identifier of the link port, identifying the applicable "extLinkPorts" entry in the "ExtVirtualLinkInfo" data
-          type (see clause 5.5.3.2).
-        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
-      changeType:
-        description: >
-          Signals the type of change.
-          Permitted values:
-          -	ADDED
-          -	REMOVED
-        type: string
-        enum:
-          - ADDED
-          - REMOVED
-      extCpInstanceId:
-        description: >
-          Identifier of the related external CP instance.
-        $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
-      resourceHandle:
-        description: >
-          Reference to the link port resource.
-          Detailed information is (for added resources) or has been (for removed resources) available from the VIM.
-        $ref: "SOL002SOL003_def.yaml#/definitions/ResourceHandle"
-      resourceDefinitionId:
-        description: >
-          The identifier of the "ResourceDefinition" in the granting exchange related to the LCM operation occurrence. 
-          It shall be present when an applicable GrantInfo for the granted resource exists.
-          The "resourceDefinitionId" attribute provides information to the API consumer (i.e. the NFVO) to assist in
-          correlating the resource changes performed during the LCM operation with the granted resources in a
-          specific Grant exchange, which is identified by the "grantId" available in the "Individual VNF lifecycle
-          management operation occurrence" and the "id" in the "Individual Grant".
-        $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierLocal"
-
   LccnLinks:
     description: >
       This type represents the links to resources that a notification can
diff --git a/src/definitions/SOL002SOL003_def.yaml b/src/definitions/SOL002SOL003_def.yaml
index d015af75da6c6e4886f412b712a62d3d93363d11..d4249c5e1c300cc321b65049f996e75b2a691d4e 100644
--- a/src/definitions/SOL002SOL003_def.yaml
+++ b/src/definitions/SOL002SOL003_def.yaml
@@ -582,59 +582,6 @@ definitions:
         items:
           $ref: "#/definitions/ExtLinkPortData"
 
-  ExtManagedVirtualLinkData:
-    type: object
-    required:
-      - id
-      - vnfVirtualLinkDescId
-      - resourceId
-    properties:
-      id:
-        description: >
-          The identifier of the externally-managed internal VL instance. The
-          identifier is assigned by the NFV-MANO entity that manages this VL
-          instance.
-        $ref: "#/definitions/Identifier"
-      vnfVirtualLinkDescId:
-        description: >
-          The identifier of the VLD in the VNFD for this VL.
-        $ref: "#/definitions/IdentifierInVnfd"
-      vimConnectionId:
-        description: >
-          Identifier of the VIM connection to manage this resource. This
-          attribute shall only be supported and present if VNF-related
-          resource management in direct mode is applicable.
-        $ref: "#/definitions/Identifier"
-      resourceProviderId:
-        description: >
-          Identifies the entity responsible for the management of this
-          resource. This attribute shall only be supported and present if
-          VNF-related resource management in indirect mode is applicable. The
-          identification scheme is outside the scope of the present document.
-        $ref: "#/definitions/Identifier"
-      resourceId:
-        description: >
-          The identifier of the resource in the scope of the VIM or the
-          resource provider.
-        $ref: "#/definitions/IdentifierInVim"
-      vnfLinkPort:
-        description: >
-          Externally provided link ports to be used to connect VNFC connection points to this externally-managed VL 
-          on this network resource. If this attribute is not present, the VNFM shall create the link ports on the 
-          externally-managed VL.
-        type: array
-        items:
-          $ref: "#/definitions/VnfLinkPortData"
-      extManagedMultisiteVirtualLinkId:
-        description: >
-          Identifier of the externally-managed multi-site VL instance. The identifier is assigned by the NFVMANO 
-          entity that manages the externally managed multi-site VL instance. It shall be present when the present 
-          externally-managed internal VL (indicated by extManagedVirtualLinkId) is part of a multi-site VL, e.g., 
-          in support of multi-site VNF spanning several VIMs. All externally-managed internal VL instances 
-          corresponding to an internal VL created based on the same virtualLinkDescId shall refer to the same 
-          extManagedMultisiteVirtualLinkId.
-        $ref: "#/definitions/Identifier"
-
   Identifier:
     description: >
       An identifier with the intention of being globally unique.