diff --git a/apps/l3vpn/netl3vpn/src/main/java/org/onosproject/l3vpn/netl3vpn/impl/NetL3VpnUtil.java b/apps/l3vpn/netl3vpn/src/main/java/org/onosproject/l3vpn/netl3vpn/impl/NetL3VpnUtil.java
index 5875fe7..53ebcd9 100644
--- a/apps/l3vpn/netl3vpn/src/main/java/org/onosproject/l3vpn/netl3vpn/impl/NetL3VpnUtil.java
+++ b/apps/l3vpn/netl3vpn/src/main/java/org/onosproject/l3vpn/netl3vpn/impl/NetL3VpnUtil.java
@@ -40,7 +40,7 @@
 import org.onosproject.yang.model.ModelObjectId;
 import org.onosproject.yang.model.ResourceData;
 import org.onosproject.yang.model.ResourceId;
-import org.onosproject.yang.runtime.DefaultResourceData;
+import org.onosproject.yang.model.DefaultResourceData;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/apps/netconf/client/src/main/java/org/onosproject/netconf/client/impl/NetconfActiveComponent.java b/apps/netconf/client/src/main/java/org/onosproject/netconf/client/impl/NetconfActiveComponent.java
index 182964b..93b8739 100644
--- a/apps/netconf/client/src/main/java/org/onosproject/netconf/client/impl/NetconfActiveComponent.java
+++ b/apps/netconf/client/src/main/java/org/onosproject/netconf/client/impl/NetconfActiveComponent.java
@@ -39,7 +39,7 @@
 import org.onosproject.yang.model.ListKey;
 import org.onosproject.yang.model.NodeKey;
 import org.onosproject.yang.model.ResourceId;
-import org.onosproject.yang.runtime.DefaultResourceData;
+import org.onosproject.yang.model.DefaultResourceData;
 import org.onlab.util.AbstractAccumulator;
 import org.onlab.util.Accumulator;
 import org.slf4j.Logger;
diff --git a/apps/netconf/client/src/main/java/org/onosproject/netconf/client/impl/NetconfTranslatorImpl.java b/apps/netconf/client/src/main/java/org/onosproject/netconf/client/impl/NetconfTranslatorImpl.java
index 3d620c7..87ff7b9 100644
--- a/apps/netconf/client/src/main/java/org/onosproject/netconf/client/impl/NetconfTranslatorImpl.java
+++ b/apps/netconf/client/src/main/java/org/onosproject/netconf/client/impl/NetconfTranslatorImpl.java
@@ -47,7 +47,7 @@
 import org.onosproject.yang.runtime.DefaultAnnotation;
 import org.onosproject.yang.runtime.DefaultCompositeData;
 import org.onosproject.yang.runtime.DefaultCompositeStream;
-import org.onosproject.yang.runtime.DefaultResourceData;
+import org.onosproject.yang.model.DefaultResourceData;
 import org.onosproject.yang.runtime.DefaultRuntimeContext;
 import org.onosproject.yang.runtime.DefaultYangSerializerContext;
 import org.onosproject.yang.runtime.YangRuntimeService;
diff --git a/apps/restconf/restconfmgr/src/main/java/org/onosproject/restconf/restconfmanager/RestconfManager.java b/apps/restconf/restconfmgr/src/main/java/org/onosproject/restconf/restconfmanager/RestconfManager.java
index 256b3a3..1ad10fd 100644
--- a/apps/restconf/restconfmgr/src/main/java/org/onosproject/restconf/restconfmanager/RestconfManager.java
+++ b/apps/restconf/restconfmgr/src/main/java/org/onosproject/restconf/restconfmanager/RestconfManager.java
@@ -38,7 +38,7 @@
 import org.onosproject.yang.model.ResourceData;
 import org.onosproject.yang.model.ResourceId;
 import org.onosproject.yang.model.SchemaId;
-import org.onosproject.yang.runtime.DefaultResourceData;
+import org.onosproject.yang.model.DefaultResourceData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/apps/restconf/utils/src/main/java/org/onosproject/restconf/utils/RestconfUtils.java b/apps/restconf/utils/src/main/java/org/onosproject/restconf/utils/RestconfUtils.java
index 253411b..1f12398 100644
--- a/apps/restconf/utils/src/main/java/org/onosproject/restconf/utils/RestconfUtils.java
+++ b/apps/restconf/utils/src/main/java/org/onosproject/restconf/utils/RestconfUtils.java
@@ -29,7 +29,7 @@
 import org.onosproject.yang.runtime.CompositeStream;
 import org.onosproject.yang.runtime.DefaultCompositeData;
 import org.onosproject.yang.runtime.DefaultCompositeStream;
-import org.onosproject.yang.runtime.DefaultResourceData;
+import org.onosproject.yang.model.DefaultResourceData;
 import org.onosproject.yang.runtime.DefaultRuntimeContext;
 import org.onosproject.yang.runtime.RuntimeContext;
 import org.onosproject.yang.runtime.YangRuntimeService;
diff --git a/lib/BUCK b/lib/BUCK
index b5b73c4..53333ad 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Tue, 9 May 2017 00:34:46 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Wed, 10 May 2017 18:17:54 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 pass_thru_pom(
@@ -1191,55 +1191,55 @@
 
 remote_jar (
   name = 'onos-yang-model',
-  out = 'onos-yang-model-1.12.0-b7.jar',
-  url = 'mvn:org.onosproject:onos-yang-model:jar:1.12.0-b7',
-  sha1 = 'bfbe79c26c8b80e1d74dc71fe3fd08028017aa67',
-  maven_coords = 'org.onosproject:onos-yang-model:1.12.0-b7',
+  out = 'onos-yang-model-1.12.0-b8.jar',
+  url = 'mvn:org.onosproject:onos-yang-model:jar:1.12.0-b8',
+  sha1 = '272ab5dd687d20d9a483cc58c8f71da31ee8b1b6',
+  maven_coords = 'org.onosproject:onos-yang-model:1.12.0-b8',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'onos-yang-compiler-api',
-  out = 'onos-yang-compiler-api-1.12.0-b7.jar',
-  url = 'mvn:org.onosproject:onos-yang-compiler-api:jar:1.12.0-b7',
-  sha1 = '9d8b4fd5101a109438b6549ac9d8b4e0655ff66f',
-  maven_coords = 'org.onosproject:onos-yang-compiler-api:1.12.0-b7',
+  out = 'onos-yang-compiler-api-1.12.0-b8.jar',
+  url = 'mvn:org.onosproject:onos-yang-compiler-api:jar:1.12.0-b8',
+  sha1 = '0c0961fb0b55b2ba82e3b69216b2fbb1b35b1d6f',
+  maven_coords = 'org.onosproject:onos-yang-compiler-api:1.12.0-b8',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'onos-yang-runtime',
-  out = 'onos-yang-runtime-1.12.0-b7.jar',
-  url = 'mvn:org.onosproject:onos-yang-runtime:jar:1.12.0-b7',
-  sha1 = 'e9f3b11b01527d6379fed8b4f8e3f88c41ce757e',
-  maven_coords = 'org.onosproject:onos-yang-runtime:1.12.0-b7',
+  out = 'onos-yang-runtime-1.12.0-b8.jar',
+  url = 'mvn:org.onosproject:onos-yang-runtime:jar:1.12.0-b8',
+  sha1 = 'b7f8d35cfe8f57978efc741f56b1431f881a8c83',
+  maven_coords = 'org.onosproject:onos-yang-runtime:1.12.0-b8',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'onos-yang-serializers-json',
-  out = 'onos-yang-serializers-json-1.12.0-b7.jar',
-  url = 'mvn:org.onosproject:onos-yang-serializers-json:jar:1.12.0-b7',
-  sha1 = '4107b260996c0083840e38e2572de74c22aa2e28',
-  maven_coords = 'org.onosproject:onos-yang-serializers-json:1.12.0-b7',
+  out = 'onos-yang-serializers-json-1.12.0-b8.jar',
+  url = 'mvn:org.onosproject:onos-yang-serializers-json:jar:1.12.0-b8',
+  sha1 = '72cb9f767f22c01f0fe7bc1e6d2ba83a20397aa0',
+  maven_coords = 'org.onosproject:onos-yang-serializers-json:1.12.0-b8',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'onos-yang-serializers-xml',
-  out = 'onos-yang-serializers-xml-1.12.0-b7.jar',
-  url = 'mvn:org.onosproject:onos-yang-serializers-xml:jar:1.12.0-b7',
-  sha1 = 'eee4ad131220f1a4ba541b548a9e2fd175a09da5',
-  maven_coords = 'org.onosproject:onos-yang-serializers-xml:1.12.0-b7',
+  out = 'onos-yang-serializers-xml-1.12.0-b8.jar',
+  url = 'mvn:org.onosproject:onos-yang-serializers-xml:jar:1.12.0-b8',
+  sha1 = 'cf5b1e7b85883d13efe35d83330cd8bbe8ba7315',
+  maven_coords = 'org.onosproject:onos-yang-serializers-xml:1.12.0-b8',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'onos-yang-serializers-utils',
-  out = 'onos-yang-serializers-utils-1.12.0-b7.jar',
-  url = 'mvn:org.onosproject:onos-yang-serializers-utils:jar:1.12.0-b7',
-  sha1 = '0b0242da58b8447429faece703df6d429da15cab',
-  maven_coords = 'org.onosproject:onos-yang-serializers-utils:1.12.0-b7',
+  out = 'onos-yang-serializers-utils-1.12.0-b8.jar',
+  url = 'mvn:org.onosproject:onos-yang-serializers-utils:jar:1.12.0-b8',
+  sha1 = 'b0d685c517e9b22d93ccefffdab455f3476545ba',
+  maven_coords = 'org.onosproject:onos-yang-serializers-utils:1.12.0-b8',
   visibility = [ 'PUBLIC' ],
 )
 
diff --git a/lib/deps.json b/lib/deps.json
index 2e631e9..bcc0dac 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -213,12 +213,12 @@
     "onos-yang-datamodel": "mvn:org.onosproject:onos-yang-datamodel:1.11",
     "onos-yang-maven-plugin": "mvn:org.onosproject:onos-yang-maven-plugin:1.11",
     "onos-yang-utils-generator": "mvn:org.onosproject:onos-yang-utils-generator:1.11",
-    "onos-yang-model":"mvn:org.onosproject:onos-yang-model:1.12.0-b7",
-    "onos-yang-compiler-api":"mvn:org.onosproject:onos-yang-compiler-api:1.12.0-b7",
-    "onos-yang-runtime":"mvn:org.onosproject:onos-yang-runtime:1.12.0-b7",
-    "onos-yang-serializers-json":"mvn:org.onosproject:onos-yang-serializers-json:1.12.0-b7",
-    "onos-yang-serializers-xml":"mvn:org.onosproject:onos-yang-serializers-xml:1.12.0-b7",
-    "onos-yang-serializers-utils":"mvn:org.onosproject:onos-yang-serializers-utils:1.12.0-b7",
+    "onos-yang-model":"mvn:org.onosproject:onos-yang-model:1.12.0-b8",
+    "onos-yang-compiler-api":"mvn:org.onosproject:onos-yang-compiler-api:1.12.0-b8",
+    "onos-yang-runtime":"mvn:org.onosproject:onos-yang-runtime:1.12.0-b8",
+    "onos-yang-serializers-json":"mvn:org.onosproject:onos-yang-serializers-json:1.12.0-b8",
+    "onos-yang-serializers-xml":"mvn:org.onosproject:onos-yang-serializers-xml:1.12.0-b8",
+    "onos-yang-serializers-utils":"mvn:org.onosproject:onos-yang-serializers-utils:1.12.0-b8",
     "org.apache.servicemix.bundles.dom4j":"mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:1.6.1_5",
     "openflowj-3.0": {
       "uri": "mvn:org.projectfloodlight:openflowj:3.0.0-SNAPSHOT",