diff --git a/example-data/nfv.xml b/example-data/nfv.xml
index 12f66684451747b5782623ea78ef57a71994ac2a..a956b2b51ebb5f5c36cab9095f918b8eefc8bded 100644
--- a/example-data/nfv.xml
+++ b/example-data/nfv.xml
@@ -48,14 +48,26 @@
     </sw-image-desc>
     <ext-cpd>
       <id>inside</id>
+      <int-cpd>
+	<vdu-id>firewall</vdu-id>
+	<cpd>inside</cpd>
+      </int-cpd>
       <layer-protocol>Ethernet</layer-protocol>
     </ext-cpd>
     <ext-cpd>
       <id>management</id>
+      <int-cpd>
+	<vdu-id>firewall</vdu-id>
+	<cpd>management</cpd>
+      </int-cpd>
       <layer-protocol>Ethernet</layer-protocol>
     </ext-cpd>
     <ext-cpd>
       <id>outside</id>
+      <int-cpd>
+	<vdu-id>firewall</vdu-id>
+	<cpd>outside</cpd>
+      </int-cpd>
       <layer-protocol>Ethernet</layer-protocol>
     </ext-cpd>
     <df>
@@ -131,14 +143,26 @@
     </sw-image-desc>
     <ext-cpd>
       <id>left</id>
+      <int-cpd>
+	<vdu-id>router</vdu-id>
+	<cpd>left</cpd>
+      </int-cpd>
       <layer-protocol>Ethernet</layer-protocol>
     </ext-cpd>
     <ext-cpd>
       <id>management</id>
+      <int-cpd>
+	<vdu-id>router</vdu-id>
+	<cpd>management</cpd>
+      </int-cpd>
       <layer-protocol>Ethernet</layer-protocol>
     </ext-cpd>
     <ext-cpd>
       <id>right</id>
+      <int-cpd>
+	<vdu-id>router</vdu-id>
+	<cpd>right</cpd>
+      </int-cpd>
       <layer-protocol>Ethernet</layer-protocol>
     </ext-cpd>
     <df>
diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang
index a570c69405623bc6e1cd0ec97229f7035f63e90a..31a11c5b4c07bb78f43da7a9bcd96fbfbd9b54b6 100644
--- a/src/yang/etsi-nfv-ns.yang
+++ b/src/yang/etsi-nfv-ns.yang
@@ -18,7 +18,7 @@ submodule etsi-nfv-ns {
        ETSI GS NFV-IFA 014 Ed261v252";
 
     reference
-      "ETSI GS NFV-IFA 011 Ed261v252";
+      "ETSI GS NFV-IFA 014 Ed261v252";
   }
 
   grouping resource-handle {
diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang
index 79b9af51da2f045469b9c734d99bd0be46f39443..debc75c2273ac1ec85bf9e8a7a9a29a5247d5271 100755
--- a/src/yang/etsi-nfv-vnf.yang
+++ b/src/yang/etsi-nfv-vnf.yang
@@ -1206,7 +1206,7 @@ submodule etsi-nfv-vnf {
           }
           leaf min-number-of-instances {
             type uint16;
-            mandatory true;
+            default 1;
             description
               "Minimum number of instances of the VNFC based on this
                VDU that is permitted to exist for this flavour.";
@@ -1216,7 +1216,7 @@ submodule etsi-nfv-vnf {
           }
           leaf max-number-of-instances {
             type uint16;
-            mandatory true;
+            default 1;
             must ". >= ../nfv:min-number-of-instances";
             reference
               "GS NFV IFA011: Section 7.1.8.3, VduProfile information
@@ -1620,7 +1620,7 @@ submodule etsi-nfv-vnf {
               must ". >= ../../../../nfv:df/" +
                    "nfv:vdu-profile[id=current()/../nfv:id]/" +
                    "nfv:min-number-of-instances";
-              mandatory true;
+              default 1;
               description
                 "Number of instances of VNFC based on this VDU to
                  deploy for this level.";
@@ -2039,6 +2039,118 @@ submodule etsi-nfv-vnf {
                AffinityOrAntiAffinityGroup information element";
           }
         }
+
+        list indicator {
+          key "id";
+
+          leaf id {
+            type string;
+            description
+              "Unique identifier.";
+            reference
+              "GS NFV IFA011: Section 7.1.11.2 VnfIndicator
+               information element";
+          }
+
+          leaf name {
+            type string;
+            description
+              "The human readable name of the VnfIndicator.";
+            reference
+              "GS NFV IFA011: Section 7.1.11.2 VnfIndicator
+               information element";
+          }
+
+          leaf indicator-value {
+            type string;
+            description
+              "Defines the allowed values or value ranges of this
+               indicator.";
+            reference
+              "GS NFV IFA011: Section 7.1.11.2 VnfIndicator
+               information element";
+          }
+
+          leaf source {
+            type enumeration {
+              enum vnf;
+              enum em;
+              enum both;
+            }
+            description
+              "Describe the source of the indicator. The possible
+               values are:
+               • VNF.
+               • EM.
+               • Both.
+
+               This tells the consumer where to send the subscription
+               request.";
+            reference
+              "GS NFV IFA011: Section 7.1.11.2 VnfIndicator
+               information element";
+          }
+
+          description
+            "Declares the VNF indicators that are supported by this
+             VNF (specific to this DF).";
+          reference
+            "GS NFV IFA011: Section 7.1.8.2 VnfDf information
+             element";
+        }
+
+        list supported-vnf-interfaces {
+          key "name";
+
+          leaf name {
+            type enumeration {
+              enum vnf-configuration;
+              enum vnf-indicator;
+            }
+            description
+              "Identifies an interface produced by the VNF. Valid
+               values:
+               - VNF_CONFIGURATION
+               - VNF_INDICATOR";
+            reference
+              "GS NFV IFA011: Section 7.1.8.16 VnfInterfaceDetails
+               information element";
+          }
+
+          leaf-list cpd-id {
+            type leafref {
+              path "../../../ext-cpd/id";
+            }
+            description
+              "References one or more CPDs from which to instantiate
+               external CPs through which interface endpoints on the
+               VNF side can be reached by the VNFM.";
+            reference
+              "GS NFV IFA011: Section 7.1.8.16 VnfInterfaceDetails
+               information element";
+          }
+
+          list interface-details {
+            key "key";
+
+            leaf key {
+              type string;
+            }
+
+            leaf value {
+              type string;
+            }
+          }
+
+          description
+            "Indicates which interfaces the VNF produces and provides
+             additional details on how to access the interface
+             endpoints.";
+          reference
+            "GS NFV IFA011: Section 7.1.8.2 VnfDf information
+             element";
+        }
+
         list monitoring-parameter {
           key "id";
 
diff --git a/src/yang/etsi-nfv.yang b/src/yang/etsi-nfv.yang
index a209fc30f22d3c0a1cbe136c512ca4ec9be6ac12..96d0db1afe03b81d01fd56e05d7021246ca3dcea 100644
--- a/src/yang/etsi-nfv.yang
+++ b/src/yang/etsi-nfv.yang
@@ -14,11 +14,11 @@ module etsi-nfv {
   description
     "Network Function Virtualization Descriptors";
 
-  revision 2018-06-13 {
+  revision 2019-03-18 {
     description
       "Initial revision.
-       NSD and PNFD according to ETSI GS NFV-IFA 014 Ed251v244
-       VNFD according to ETSI GS NFV-IFA 011 Ed251v243";
+       NSD and PNFD according to ETSI GS NFV-IFA 014 Ed261v252
+       VNFD according to ETSI GS NFV-IFA 011 Ed261v254";
   }
 
   container nfv {