diff --git a/example-data/nfv-nsd.xml b/example-data/nfv-nsd.xml
index 03423e679e4915da8a7be7fccd2b929935b0e3cf..85d14555a4725517282eac587e58ba387e7806b0 100644
--- a/example-data/nfv-nsd.xml
+++ b/example-data/nfv-nsd.xml
@@ -1,136 +1,152 @@
-<nsd xmlns="urn:etsi:nfv:yang:etsi-nfv-nsd">
-  <vnfd>
-    <id>ASA</id>
-    <provider>My Company</provider>
-    <product-name>My Company ASAv</product-name>
-    <software-version>9.8</software-version>
-    <version>9.8</version>
-    <vnfm-info>My Company Vnfm</vnfm-info>
-    <vdu>
-      <id>firewall</id>
-      <name>Firewall VDU</name>
-      <int-cpd>
-        <id>inside</id>
-      <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>
-      </int-cpd>
-      <int-cpd>
-        <id>management</id>
-      <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>
-      </int-cpd>
-      <int-cpd>
-        <id>outside</id>
-      <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>
-      </int-cpd>
-      <virtual-compute-desc>asa-vcd</virtual-compute-desc>
-      <virtual-storage-desc>asa-vsd</virtual-storage-desc>
-      <sw-image-desc>asa-image</sw-image-desc>
-    </vdu>
-    <virtual-compute-desc>
-      <id>asa-vcd</id>
-      <virtual-memory>
-        <size>4.0</size>
-      </virtual-memory>
-      <virtual-cpu>
-        <num-virtual-cpu>2</num-virtual-cpu>
-      </virtual-cpu>
-    </virtual-compute-desc>
-    <virtual-storage-desc>
-      <id>asa-vsd</id>
-    <type-of-storage xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:root-storage</type-of-storage>
-      <size-of-storage>0</size-of-storage>
-    </virtual-storage-desc>
-    <sw-image-desc>
-      <id>asa-image</id>
-      <name>ASA image</name>
-      <version>1.1</version>
-      <checksum>
-	<algorithm xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:sha-224</algorithm>
-	<hash>deadbeef</hash>
-      </checksum>
-      <container-format>bare</container-format>
-      <disk-format>qcow2</disk-format>
-      <min-disk>1</min-disk>
-      <min-ram>2.0</min-ram>
-      <size>1</size>
-      <image>http://www.cisco.com/asa.qcow2</image>
-    </sw-image-desc>
-    <ext-cpd>
-      <id>inside</id>
-      <int-cpd>
-	<vdu-id>firewall</vdu-id>
-	<cpd>inside</cpd>
-      </int-cpd>
-      <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>
-    </ext-cpd>
-    <ext-cpd>
-      <id>management</id>
-      <int-cpd>
-	<vdu-id>firewall</vdu-id>
-	<cpd>management</cpd>
-      </int-cpd>
-      <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>
-    </ext-cpd>
-    <ext-cpd>
-      <id>outside</id>
-      <int-cpd>
-	<vdu-id>firewall</vdu-id>
-	<cpd>outside</cpd>
-      </int-cpd>
-      <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>
-    </ext-cpd>
-    <df>
-      <id>normal</id>
-      <vdu-profile>
-        <id>firewall</id>
-        <min-number-of-instances>1</min-number-of-instances>
-        <max-number-of-instances>2</max-number-of-instances>
-      </vdu-profile>
-      <instantiation-level>
-        <id>double</id>
-        <vdu-level>
-          <vdu-id>firewall</vdu-id>
-          <number-of-instances>2</number-of-instances>
-        </vdu-level>
-      </instantiation-level>
-      <instantiation-level>
-        <id>single</id>
-        <vdu-level>
-          <vdu-id>firewall</vdu-id>
-          <number-of-instances>1</number-of-instances>
-        </vdu-level>
-      </instantiation-level>
-      <default-instantiation-level>single</default-instantiation-level>
-    </df>
-  </vnfd>
-  <nsd>
-    <id>firewall-nsd</id>
-    <vnfd-id>ASA</vnfd-id>
-    <sapd>
-      <id>inside</id>
-    </sapd>
-    <sapd>
-      <id>management</id>
-    </sapd>
-    <sapd>
-      <id>outside</id>
-    </sapd>
-    <df>
-      <id>firewall</id>
-      <vnf-profile>
-        <id>firewall</id>
-        <vnfd-id>ASA</vnfd-id>
-        <flavour-id>normal</flavour-id>
-        <instantiation-level>single</instantiation-level>
-        <min-number-of-instances>1</min-number-of-instances>
-        <max-number-of-instances>1</max-number-of-instances>
-      </vnf-profile>
-      <ns-instantiation-level>
-        <id>single</id>
-        <vnf-to-level-mapping>
-          <vnf-profile-id>firewall</vnf-profile-id>
-          <number-of-instances>1</number-of-instances>
-        </vnf-to-level-mapping>
-      </ns-instantiation-level>
-    </df>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+  <nfv xmlns="urn:etsi:nfv:yang:etsi-nfv-descriptors">
+    <vnfd>
+      <id>ASA</id>
+      <provider>My Company</provider>
+      <product-name>My Company ASAv</product-name>
+      <software-version>9.8</software-version>
+      <version>9.8</version>
+      <vnfm-info>My Company Vnfm</vnfm-info>
+      <vdu>
+	<id>firewall</id>
+	<name>Firewall VDU</name>
+	<int-cpd>
+          <id>inside</id>
+          <layer-protocol>ethernet</layer-protocol>
+	</int-cpd>
+	<int-cpd>
+          <id>management</id>
+          <layer-protocol>ethernet</layer-protocol>
+	</int-cpd>
+	<int-cpd>
+          <id>outside</id>
+          <layer-protocol>ethernet</layer-protocol>
+	</int-cpd>
+	<virtual-compute-desc>asa-vcd</virtual-compute-desc>
+	<virtual-storage-desc>asa-vsd</virtual-storage-desc>
+	<sw-image-desc>asa-image</sw-image-desc>
+      </vdu>
+      <virtual-compute-desc>
+	<id>asa-vcd</id>
+	<virtual-memory>
+          <size>4.0</size>
+	</virtual-memory>
+	<virtual-cpu>
+          <num-virtual-cpu>2</num-virtual-cpu>
+	</virtual-cpu>
+      </virtual-compute-desc>
+      <virtual-storage-desc>
+	<id>asa-vsd</id>
+	<type-of-storage>root-storage</type-of-storage>
+	<size-of-storage>0</size-of-storage>
+      </virtual-storage-desc>
+      <sw-image-desc>
+	<id>asa-image</id>
+	<name>ASA image</name>
+	<version>1.1</version>
+	<checksum>
+	  <algorithm>sha-224</algorithm>
+	  <hash>deadbeef</hash>
+	</checksum>
+	<container-format>bare</container-format>
+	<disk-format>qcow2</disk-format>
+	<min-disk>1</min-disk>
+	<min-ram>2.0</min-ram>
+	<size>1</size>
+	<image>http://mycompany.images.com/asa.qcow2</image>
+      </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>
+	<id>normal</id>
+	<vdu-profile>
+          <id>firewall</id>
+          <min-number-of-instances>1</min-number-of-instances>
+          <max-number-of-instances>2</max-number-of-instances>
+	</vdu-profile>
+	<instantiation-level>
+          <id>double</id>
+          <vdu-level>
+            <vdu-id>firewall</vdu-id>
+            <number-of-instances>2</number-of-instances>
+          </vdu-level>
+	</instantiation-level>
+	<instantiation-level>
+          <id>single</id>
+          <vdu-level>
+            <vdu-id>firewall</vdu-id>
+            <number-of-instances>1</number-of-instances>
+          </vdu-level>
+	</instantiation-level>
+	<default-instantiation-level>single</default-instantiation-level>
+	<lcm-operations-configuration>
+	  <scale-vnf-to-level-op-config>
+	    <arbitrary-target-levels-supported>true</arbitrary-target-levels-supported>
+	  </scale-vnf-to-level-op-config>
+	  <terminate-vnf-op-config>
+	    <min-graceful-termination>1</min-graceful-termination>
+	  </terminate-vnf-op-config>
+	  <operate-vnf-op-config>
+	    <min-graceful-stop-timeout>1</min-graceful-stop-timeout>
+	  </operate-vnf-op-config>
+	</lcm-operations-configuration>
+      </df>
+    </vnfd>
+  </nfv>
+  <nsd xmlns="urn:etsi:nfv:yang:etsi-nfv-nsd">
+    <nsd>
+      <id>firewall-nsd</id>
+      <vnfd-id>ASA</vnfd-id>
+      <sapd>
+	<id>inside</id>
+      </sapd>
+      <sapd>
+	<id>management</id>
+      </sapd>
+      <sapd>
+	<id>outside</id>
+      </sapd>
+      <df>
+	<id>firewall</id>
+	<vnf-profile>
+          <id>firewall</id>
+          <vnfd-id>ASA</vnfd-id>
+          <flavour-id>normal</flavour-id>
+          <instantiation-level>single</instantiation-level>
+          <min-number-of-instances>1</min-number-of-instances>
+          <max-number-of-instances>1</max-number-of-instances>
+	</vnf-profile>
+	<ns-instantiation-level>
+          <id>single</id>
+          <vnf-to-level-mapping>
+            <vnf-profile-id>firewall</vnf-profile-id>
+            <number-of-instances>1</number-of-instances>
+          </vnf-to-level-mapping>
+	</ns-instantiation-level>
+      </df>
+    </nsd>
   </nsd>
-</nsd>
+</config>
diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang
index 5f80ffe5d5dfe17f92b0136df0368e18b2c8efe8..b9302202d214782101500b995d98209cb858abf9 100644
--- a/src/yang/etsi-nfv-ns.yang
+++ b/src/yang/etsi-nfv-ns.yang
@@ -97,7 +97,7 @@ submodule etsi-nfv-ns {
 
     leaf-list vnfd-id {
       type leafref {
-        path "../../vnfd/id";
+        path "/nfv:nfv/nfv:vnfd/nfv:id";
       }
       description
         "References the VNFD of a constituent VNF.";
@@ -108,7 +108,7 @@ submodule etsi-nfv-ns {
 
     leaf-list pnfd-id {
       type leafref {
-        path "../../pnfd/id";
+        path "/nfv:nfv/nfv:pnfd/nfv:id";
       }
       description
         "References the PNFD of a constituent PNF.";
@@ -164,7 +164,7 @@ submodule etsi-nfv-ns {
             leaf vnfd-id {
               mandatory true;
               type leafref {
-                path "../../../../vnfd/id";
+                path "/nfv:nfv/nfv:vnfd/nfv:id";
               }
               must "boolean(../../../vnfd-id[.=current()])";
             }
@@ -172,7 +172,7 @@ submodule etsi-nfv-ns {
             leaf ext-cpd-id {
               mandatory true;
               type leafref {
-                path "deref(../vnfd-id)/../ext-cpd/id";
+                path "deref(../vnfd-id)/../nfv:ext-cpd/nfv:id";
               }
             }
           }
@@ -181,7 +181,7 @@ submodule etsi-nfv-ns {
             leaf pnfd-id {
               mandatory true;
               type leafref {
-                path "../../../../pnfd/id";
+                path "/nfv:nfv/nfv:pnfd/nfv:id";
               }
               must "boolean(../pnfd-id[.=current()])";
             }
@@ -189,7 +189,7 @@ submodule etsi-nfv-ns {
             leaf ext-cpd-id {
               mandatory true;
               type leafref {
-                path "deref(../pnfd-id)/../ext-cpd/id";
+                path "deref(../pnfd-id)/../nfv:ext-cpd/nfv:id";
               }
             }
           }
@@ -466,19 +466,18 @@ submodule etsi-nfv-ns {
                CpdInConstituentElement information element";
           }
 
-          choice constituent-cpd-id {
-            container vnf {
-              leaf vnfd-id {
-                must ". = deref(../../vnfd-profile-id)/../vnfd-id" {
-                }
-                type leafref {
-                  path "../../../../../../vnfd/id";
-                }
+        choice constituent-cpd-id {
+          container vnf {
+            leaf vnfd-id {
+              must ". = deref(../../vnfd-profile-id)/../vnfd-id" {
               }
-              leaf cpd-id {
-                type leafref {
-                  path "deref(../vnfd-id)/../ext-cpd/id";
-                }
+              type leafref {
+                path "/nfv:nfv/nfv:vnfd/nfv:id";
+              }
+            }
+            leaf cpd-id {
+              type leafref {
+                path "deref(../vnfd-id)/../nfv:ext-cpd/nfv:id";
               }
             }
             container pnf {
@@ -489,10 +488,13 @@ submodule etsi-nfv-ns {
                   path "../../../../../../pnfd/id";
                 }
               }
-              leaf pnf-cpd-id {
-                type leafref {
-                  path "deref(../pnfd-id)/../ext-cpd/id";
-                }
+              type leafref {
+                path "/nfv:nfv/nfv:pnfd/nfv:id";
+              }
+            }
+            leaf pnf-cpd-id {
+              type leafref {
+                path "deref(../pnfd-id)/../nfv:ext-cpd/nfv:id";
               }
             }
             container ns {
@@ -637,6 +639,7 @@ submodule etsi-nfv-ns {
     leaf-list autoscale-rule {
       type string;
     }
+
     list lifecycle-management-script {
       key "event";
       leaf event {
@@ -716,7 +719,7 @@ submodule etsi-nfv-ns {
         leaf vnfd-id {
           mandatory true;
           type leafref {
-            path "../../../../vnfd/id";
+            path "/nfv:nfv/nfv:vnfd/nfv:id";
           }
           description
             "References a VNFD.";
@@ -728,7 +731,7 @@ submodule etsi-nfv-ns {
         leaf flavour-id {
           mandatory true;
           type leafref {
-            path "deref(../vnfd-id)/../df/id";
+            path "deref(../vnfd-id)/../nfv:df/nfv:id";
           }
           description
             "Identifies a flavour within the VNFD.";
@@ -740,7 +743,8 @@ submodule etsi-nfv-ns {
         leaf instantiation-level {
           mandatory true;
           type leafref {
-            path "deref(../flavour-id)/../instantiation-level/id";
+            path "deref(../flavour-id)/../nfv:instantiation-level/" +
+	         "nfv:id";
           }
           description
             "Identifier of the instantiation level of the VNF DF
@@ -840,7 +844,7 @@ submodule etsi-nfv-ns {
 
             leaf constituent-cpd-id {
               type leafref {
-                path "deref(../../../vnfd-id)/../ext-cpd/id";
+                path "deref(../../../vnfd-id)/../nfv:ext-cpd/nfv:id";
               }
               description
                 "A reference to the descriptor of a connection point
@@ -874,7 +878,7 @@ submodule etsi-nfv-ns {
 
         leaf pnfd-id {
           type leafref {
-            path "../../../../pnfd/id";
+            path "/nfv:nfv/nfv:pnfd/nfv:id";
           }
           description
             "References a PNFD.";
@@ -930,7 +934,7 @@ submodule etsi-nfv-ns {
 
             leaf constituent-cpd-id {
               type leafref {
-                path "deref(../../../pnfd-id)/../ext-cpd/id";
+                path "deref(../../../pnfd-id)/../nfv:ext-cpd/nfv:id";
               }
               description
                 "A reference to the descriptor of a connection point
@@ -1501,7 +1505,7 @@ submodule etsi-nfv-ns {
         container vnf-indicator-info {
           leaf vnfd-id {
             type leafref {
-              path "../../../../../vnfd/id";
+              path "/nfv:nfv/nfv:vnfd/nfv:id";
             }
             description
               "Identifies a VNFD.";
@@ -1513,7 +1517,7 @@ submodule etsi-nfv-ns {
 	  leaf vnf-indicator {
             mandatory true;
             type leafref {
-              path "deref(../vnfd-id)/../indicator/id";
+              path "deref(../vnfd-id)/../nfv:indicator/nfv:id";
             }
             description
               "Identifies a VNF indicator within the VNFD.";
diff --git a/src/yang/etsi-nfv-nsd.yang b/src/yang/etsi-nfv-nsd.yang
index 52cd50858104cbfdf6de45381c30bdd3f4dc4fd6..ad3d05df04327b00f511d3ffc17da85101f14e96 100644
--- a/src/yang/etsi-nfv-nsd.yang
+++ b/src/yang/etsi-nfv-nsd.yang
@@ -20,19 +20,6 @@ module etsi-nfv-nsd {
   }
 
   container nsd {
-    list vnfd {
-      key "id";
-      description
-        "A VNF Descriptor (VNFD) is a deployment template which
-         describes a VNF in terms of deployment and operational
-         behaviour requirements. It also contains connectivity,
-         interface and virtualised resource requirements";
-      reference
-        "GS NFV-IFA011: Section 7.1.2, VNFD information element";
-
-      uses vnf:vnfd;
-    }
-
     list nsd {
       key "id";
       max-elements 1;
@@ -45,18 +32,5 @@ module etsi-nfv-nsd {
         "GS NFV-IFA014: Section 6.2.2, Network Service Descriptor
          information element";
     }
-
-    list pnfd {
-      key "id";
-
-      description
-	"The Pnfd information element is a deployment template
-         enabling on-boarding PNFs and referencing them from an
-         NSD. It focuses on connectivity aspects only.";
-      reference
-        "GS NFV-IFA014: Section 6.6.2, Pnfd information element.";
-
-      uses vnf:pnfd;
-    }
   }
 }
diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang
index 6aa9daa96d78544235eb400db0c70fed8997ad26..48cc23369ee60f6de42fd45e9d7553cc80735a13 100755
--- a/src/yang/etsi-nfv-vnf.yang
+++ b/src/yang/etsi-nfv-vnf.yang
@@ -237,7 +237,7 @@ submodule etsi-nfv-vnf {
 
         leaf int-virtual-link-desc {
           type leafref {
-            path "../../../int-virtual-link-desc/id";
+            path "/nfv:nfv/nfv:vnfd/nfv:int-virtual-link-desc/nfv:id";
           }
           description
             "Reference of the internal VLD which this internal CPD
@@ -260,7 +260,7 @@ submodule etsi-nfv-vnf {
 
         leaf nicio-requirements {
           type leafref {
-            path "../../../virtual-compute-desc/id";
+            path "/nfv:nfv/nfv:vnfd/nfv:virtual-compute-desc/nfv:id";
           }
           description
             "This references (couples) the CPD with any logical node I/O
@@ -1254,7 +1254,7 @@ submodule etsi-nfv-vnf {
              Descriptor (CPD) connect. Either intVirtualLinkDesc or
              intCpd shall be present.";
           type leafref {
-            path "../../int-virtual-link-desc/id";
+            path "/nfv:nfv/nfv:vnfd/nfv:int-virtual-link-desc/nfv:id";
           }
         }
 
@@ -1292,7 +1292,7 @@ submodule etsi-nfv-vnf {
 
       leaf nicio-requirements {
         type leafref {
-          path "../../virtual-compute-desc/id";
+          path "/nfv:nfv/nfv:vnfd/nfv:virtual-compute-desc/nfv:id";
         }
         description
           "This references (couples) the CPD with any logical node I/O
@@ -1472,7 +1472,7 @@ submodule etsi-nfv-vnf {
 
         leaf id {
           type leafref {
-            path "../../../int-virtual-link-desc/id";
+            path "/nfv:nfv/nfv:vnfd/nfv:int-virtual-link-desc/nfv:id";
           }
           description
             "Uniquely identifies a Vnf VLD.";
@@ -1484,7 +1484,7 @@ submodule etsi-nfv-vnf {
         leaf flavour {
           type leafref {
             path "deref(../../../ext-cpd/int-virtual-link-desc)" +
-                 "/../flavour/id";
+                 "/../nfv:flavour/nfv:id";
           }
           description
             "Identifies a flavour within the VnfVirtualLinkDesc.";
@@ -2824,7 +2824,7 @@ submodule etsi-nfv-vnf {
 
       leaf-list virtual-link-desc {
         type leafref {
-          path "../../int-virtual-link-desc/id";
+          path "/nfv:nfv/nfv:vnfd/nfv:int-virtual-link-desc/nfv:id";
         }
         description
           "References to VnfVirtualLinkDesc that are part of this