diff --git a/go/common/meta.pb.go b/go/common/meta.pb.go
index b8b9181..181f3dd 100644
--- a/go/common/meta.pb.go
+++ b/go/common/meta.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: voltha_protos/meta.proto
 
-package common // import "github.com/opencord/voltha-protos/go/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +19,7 @@
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type Access int32
 
@@ -36,6 +38,7 @@
 	1: "READ_ONLY",
 	2: "REAL_TIME",
 }
+
 var Access_value = map[string]int32{
 	"CONFIG":    0,
 	"READ_ONLY": 1,
@@ -45,8 +48,9 @@
 func (x Access) String() string {
 	return proto.EnumName(Access_name, int32(x))
 }
+
 func (Access) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_meta_7d0d80d5e7f91838, []int{0}
+	return fileDescriptor_96b320e8a67781f3, []int{0}
 }
 
 type ChildNode struct {
@@ -60,16 +64,17 @@
 func (m *ChildNode) String() string { return proto.CompactTextString(m) }
 func (*ChildNode) ProtoMessage()    {}
 func (*ChildNode) Descriptor() ([]byte, []int) {
-	return fileDescriptor_meta_7d0d80d5e7f91838, []int{0}
+	return fileDescriptor_96b320e8a67781f3, []int{0}
 }
+
 func (m *ChildNode) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ChildNode.Unmarshal(m, b)
 }
 func (m *ChildNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ChildNode.Marshal(b, m, deterministic)
 }
-func (dst *ChildNode) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ChildNode.Merge(dst, src)
+func (m *ChildNode) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChildNode.Merge(m, src)
 }
 func (m *ChildNode) XXX_Size() int {
 	return xxx_messageInfo_ChildNode.Size(m)
@@ -92,7 +97,7 @@
 	ExtensionType: (*ChildNode)(nil),
 	Field:         7761772,
 	Name:          "voltha.child_node",
-	Tag:           "bytes,7761772,opt,name=child_node,json=childNode",
+	Tag:           "bytes,7761772,opt,name=child_node",
 	Filename:      "voltha_protos/meta.proto",
 }
 
@@ -106,15 +111,15 @@
 }
 
 func init() {
-	proto.RegisterType((*ChildNode)(nil), "voltha.ChildNode")
 	proto.RegisterEnum("voltha.Access", Access_name, Access_value)
+	proto.RegisterType((*ChildNode)(nil), "voltha.ChildNode")
 	proto.RegisterExtension(E_ChildNode)
 	proto.RegisterExtension(E_Access)
 }
 
-func init() { proto.RegisterFile("voltha_protos/meta.proto", fileDescriptor_meta_7d0d80d5e7f91838) }
+func init() { proto.RegisterFile("voltha_protos/meta.proto", fileDescriptor_96b320e8a67781f3) }
 
-var fileDescriptor_meta_7d0d80d5e7f91838 = []byte{
+var fileDescriptor_96b320e8a67781f3 = []byte{
 	// 271 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0x41, 0x4b, 0x84, 0x40,
 	0x18, 0x86, 0xb3, 0x05, 0xc1, 0x2f, 0x5a, 0xcc, 0x93, 0x04, 0x0b, 0xd2, 0x69, 0x29, 0x76, 0x06,
