diff --git a/go/inter_container/inter_container.pb.go b/go/inter_container/inter_container.pb.go
index 40ca168..79ce1b1 100644
--- a/go/inter_container/inter_container.pb.go
+++ b/go/inter_container/inter_container.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: voltha_protos/inter_container.proto
 
-package inter_container // import "github.com/opencord/voltha-protos/go/inter_container"
+package inter_container
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import openflow_13 "github.com/opencord/voltha-protos/go/openflow_13"
-import voltha "github.com/opencord/voltha-protos/go/voltha"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	openflow_13 "github.com/opencord/voltha-protos/go/openflow_13"
+	voltha "github.com/opencord/voltha-protos/go/voltha"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +21,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
 
 // LogicalPortId from public import voltha_protos/logical_device.proto
 type LogicalPortId = voltha.LogicalPortId
@@ -49,6 +51,7 @@
 	1: "RESPONSE",
 	2: "DEVICE_DISCOVERED",
 }
+
 var MessageType_value = map[string]int32{
 	"REQUEST":           0,
 	"RESPONSE":          1,
@@ -58,8 +61,9 @@
 func (x MessageType) String() string {
 	return proto.EnumName(MessageType_name, int32(x))
 }
+
 func (MessageType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{0}
+	return fileDescriptor_941f0031a549667f, []int{0}
 }
 
 type ErrorCodeCodes int32
@@ -73,6 +77,7 @@
 	0: "UNSUPPORTED_REQUEST",
 	1: "INVALID_PARAMETERS",
 }
+
 var ErrorCodeCodes_value = map[string]int32{
 	"UNSUPPORTED_REQUEST": 0,
 	"INVALID_PARAMETERS":  1,
@@ -81,8 +86,9 @@
 func (x ErrorCodeCodes) String() string {
 	return proto.EnumName(ErrorCodeCodes_name, int32(x))
 }
+
 func (ErrorCodeCodes) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{4, 0}
+	return fileDescriptor_941f0031a549667f, []int{4, 0}
 }
 
 type InterAdapterMessageType_Types int32
@@ -108,6 +114,7 @@
 	6: "ONU_IND_REQUEST",
 	7: "ONU_IND_RESPONSE",
 }
+
 var InterAdapterMessageType_Types_value = map[string]int32{
 	"FLOW_REQUEST":     0,
 	"FLOW_RESPONSE":    1,
@@ -122,8 +129,9 @@
 func (x InterAdapterMessageType_Types) String() string {
 	return proto.EnumName(InterAdapterMessageType_Types_name, int32(x))
 }
+
 func (InterAdapterMessageType_Types) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{14, 0}
+	return fileDescriptor_941f0031a549667f, []int{14, 0}
 }
 
 type StrType struct {
@@ -137,16 +145,17 @@
 func (m *StrType) String() string { return proto.CompactTextString(m) }
 func (*StrType) ProtoMessage()    {}
 func (*StrType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{0}
+	return fileDescriptor_941f0031a549667f, []int{0}
 }
+
 func (m *StrType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StrType.Unmarshal(m, b)
 }
 func (m *StrType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StrType.Marshal(b, m, deterministic)
 }
-func (dst *StrType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StrType.Merge(dst, src)
+func (m *StrType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StrType.Merge(m, src)
 }
 func (m *StrType) XXX_Size() int {
 	return xxx_messageInfo_StrType.Size(m)
@@ -175,16 +184,17 @@
 func (m *IntType) String() string { return proto.CompactTextString(m) }
 func (*IntType) ProtoMessage()    {}
 func (*IntType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{1}
+	return fileDescriptor_941f0031a549667f, []int{1}
 }
+
 func (m *IntType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IntType.Unmarshal(m, b)
 }
 func (m *IntType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IntType.Marshal(b, m, deterministic)
 }
-func (dst *IntType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IntType.Merge(dst, src)
+func (m *IntType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IntType.Merge(m, src)
 }
 func (m *IntType) XXX_Size() int {
 	return xxx_messageInfo_IntType.Size(m)
@@ -213,16 +223,17 @@
 func (m *BoolType) String() string { return proto.CompactTextString(m) }
 func (*BoolType) ProtoMessage()    {}
 func (*BoolType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{2}
+	return fileDescriptor_941f0031a549667f, []int{2}
 }
+
 func (m *BoolType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BoolType.Unmarshal(m, b)
 }
 func (m *BoolType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BoolType.Marshal(b, m, deterministic)
 }
-func (dst *BoolType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BoolType.Merge(dst, src)
+func (m *BoolType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoolType.Merge(m, src)
 }
 func (m *BoolType) XXX_Size() int {
 	return xxx_messageInfo_BoolType.Size(m)
@@ -251,16 +262,17 @@
 func (m *Packet) String() string { return proto.CompactTextString(m) }
 func (*Packet) ProtoMessage()    {}
 func (*Packet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{3}
+	return fileDescriptor_941f0031a549667f, []int{3}
 }
+
 func (m *Packet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Packet.Unmarshal(m, b)
 }
 func (m *Packet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Packet.Marshal(b, m, deterministic)
 }
-func (dst *Packet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Packet.Merge(dst, src)
+func (m *Packet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Packet.Merge(m, src)
 }
 func (m *Packet) XXX_Size() int {
 	return xxx_messageInfo_Packet.Size(m)
@@ -288,16 +300,17 @@
 func (m *ErrorCode) String() string { return proto.CompactTextString(m) }
 func (*ErrorCode) ProtoMessage()    {}
 func (*ErrorCode) Descriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{4}
+	return fileDescriptor_941f0031a549667f, []int{4}
 }
+
 func (m *ErrorCode) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ErrorCode.Unmarshal(m, b)
 }
 func (m *ErrorCode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ErrorCode.Marshal(b, m, deterministic)
 }
-func (dst *ErrorCode) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ErrorCode.Merge(dst, src)
+func (m *ErrorCode) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorCode.Merge(m, src)
 }
 func (m *ErrorCode) XXX_Size() int {
 	return xxx_messageInfo_ErrorCode.Size(m)
@@ -320,16 +333,17 @@
 func (m *Error) String() string { return proto.CompactTextString(m) }
 func (*Error) ProtoMessage()    {}
 func (*Error) Descriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{5}
+	return fileDescriptor_941f0031a549667f, []int{5}
 }
+
 func (m *Error) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Error.Unmarshal(m, b)
 }
 func (m *Error) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Error.Marshal(b, m, deterministic)
 }
-func (dst *Error) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Error.Merge(dst, src)
+func (m *Error) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Error.Merge(m, src)
 }
 func (m *Error) XXX_Size() int {
 	return xxx_messageInfo_Error.Size(m)
@@ -370,16 +384,17 @@
 func (m *Header) String() string { return proto.CompactTextString(m) }
 func (*Header) ProtoMessage()    {}
 func (*Header) Descriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{6}
+	return fileDescriptor_941f0031a549667f, []int{6}
 }
+
 func (m *Header) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Header.Unmarshal(m, b)
 }
 func (m *Header) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Header.Marshal(b, m, deterministic)
 }
-func (dst *Header) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Header.Merge(dst, src)
+func (m *Header) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Header.Merge(m, src)
 }
 func (m *Header) XXX_Size() int {
 	return xxx_messageInfo_Header.Size(m)
@@ -444,16 +459,17 @@
 func (m *Argument) String() string { return proto.CompactTextString(m) }
 func (*Argument) ProtoMessage()    {}
 func (*Argument) Descriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{7}
+	return fileDescriptor_941f0031a549667f, []int{7}
 }
+
 func (m *Argument) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Argument.Unmarshal(m, b)
 }
 func (m *Argument) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Argument.Marshal(b, m, deterministic)
 }
-func (dst *Argument) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Argument.Merge(dst, src)
+func (m *Argument) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Argument.Merge(m, src)
 }
 func (m *Argument) XXX_Size() int {
 	return xxx_messageInfo_Argument.Size(m)
@@ -490,16 +506,17 @@
 func (m *InterContainerMessage) String() string { return proto.CompactTextString(m) }
 func (*InterContainerMessage) ProtoMessage()    {}
 func (*InterContainerMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{8}
+	return fileDescriptor_941f0031a549667f, []int{8}
 }
+
 func (m *InterContainerMessage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InterContainerMessage.Unmarshal(m, b)
 }
 func (m *InterContainerMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InterContainerMessage.Marshal(b, m, deterministic)
 }
-func (dst *InterContainerMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InterContainerMessage.Merge(dst, src)
+func (m *InterContainerMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InterContainerMessage.Merge(m, src)
 }
 func (m *InterContainerMessage) XXX_Size() int {
 	return xxx_messageInfo_InterContainerMessage.Size(m)
@@ -538,16 +555,17 @@
 func (m *InterContainerRequestBody) String() string { return proto.CompactTextString(m) }
 func (*InterContainerRequestBody) ProtoMessage()    {}
 func (*InterContainerRequestBody) Descriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{9}
+	return fileDescriptor_941f0031a549667f, []int{9}
 }
+
 func (m *InterContainerRequestBody) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InterContainerRequestBody.Unmarshal(m, b)
 }
 func (m *InterContainerRequestBody) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InterContainerRequestBody.Marshal(b, m, deterministic)
 }
-func (dst *InterContainerRequestBody) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InterContainerRequestBody.Merge(dst, src)
+func (m *InterContainerRequestBody) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InterContainerRequestBody.Merge(m, src)
 }
 func (m *InterContainerRequestBody) XXX_Size() int {
 	return xxx_messageInfo_InterContainerRequestBody.Size(m)
@@ -598,16 +616,17 @@
 func (m *InterContainerResponseBody) String() string { return proto.CompactTextString(m) }
 func (*InterContainerResponseBody) ProtoMessage()    {}
 func (*InterContainerResponseBody) Descriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{10}
+	return fileDescriptor_941f0031a549667f, []int{10}
 }
+
 func (m *InterContainerResponseBody) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InterContainerResponseBody.Unmarshal(m, b)
 }
 func (m *InterContainerResponseBody) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InterContainerResponseBody.Marshal(b, m, deterministic)
 }
-func (dst *InterContainerResponseBody) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InterContainerResponseBody.Merge(dst, src)
+func (m *InterContainerResponseBody) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InterContainerResponseBody.Merge(m, src)
 }
 func (m *InterContainerResponseBody) XXX_Size() int {
 	return xxx_messageInfo_InterContainerResponseBody.Size(m)
@@ -644,16 +663,17 @@
 func (m *SwitchCapability) String() string { return proto.CompactTextString(m) }
 func (*SwitchCapability) ProtoMessage()    {}
 func (*SwitchCapability) Descriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{11}
+	return fileDescriptor_941f0031a549667f, []int{11}
 }
+
 func (m *SwitchCapability) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SwitchCapability.Unmarshal(m, b)
 }
 func (m *SwitchCapability) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SwitchCapability.Marshal(b, m, deterministic)
 }
-func (dst *SwitchCapability) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SwitchCapability.Merge(dst, src)
+func (m *SwitchCapability) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SwitchCapability.Merge(m, src)
 }
 func (m *SwitchCapability) XXX_Size() int {
 	return xxx_messageInfo_SwitchCapability.Size(m)
@@ -689,16 +709,17 @@
 func (m *PortCapability) String() string { return proto.CompactTextString(m) }
 func (*PortCapability) ProtoMessage()    {}
 func (*PortCapability) Descriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{12}
+	return fileDescriptor_941f0031a549667f, []int{12}
 }
+
 func (m *PortCapability) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PortCapability.Unmarshal(m, b)
 }
 func (m *PortCapability) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PortCapability.Marshal(b, m, deterministic)
 }
-func (dst *PortCapability) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PortCapability.Merge(dst, src)
+func (m *PortCapability) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PortCapability.Merge(m, src)
 }
 func (m *PortCapability) XXX_Size() int {
 	return xxx_messageInfo_PortCapability.Size(m)
@@ -730,16 +751,17 @@
 func (m *DeviceDiscovered) String() string { return proto.CompactTextString(m) }
 func (*DeviceDiscovered) ProtoMessage()    {}
 func (*DeviceDiscovered) Descriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{13}
+	return fileDescriptor_941f0031a549667f, []int{13}
 }
+
 func (m *DeviceDiscovered) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeviceDiscovered.Unmarshal(m, b)
 }
 func (m *DeviceDiscovered) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeviceDiscovered.Marshal(b, m, deterministic)
 }
-func (dst *DeviceDiscovered) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeviceDiscovered.Merge(dst, src)
+func (m *DeviceDiscovered) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceDiscovered.Merge(m, src)
 }
 func (m *DeviceDiscovered) XXX_Size() int {
 	return xxx_messageInfo_DeviceDiscovered.Size(m)
@@ -788,16 +810,17 @@
 func (m *InterAdapterMessageType) String() string { return proto.CompactTextString(m) }
 func (*InterAdapterMessageType) ProtoMessage()    {}
 func (*InterAdapterMessageType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{14}
+	return fileDescriptor_941f0031a549667f, []int{14}
 }
+
 func (m *InterAdapterMessageType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InterAdapterMessageType.Unmarshal(m, b)
 }
 func (m *InterAdapterMessageType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InterAdapterMessageType.Marshal(b, m, deterministic)
 }
-func (dst *InterAdapterMessageType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InterAdapterMessageType.Merge(dst, src)
+func (m *InterAdapterMessageType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InterAdapterMessageType.Merge(m, src)
 }
 func (m *InterAdapterMessageType) XXX_Size() int {
 	return xxx_messageInfo_InterAdapterMessageType.Size(m)
@@ -825,16 +848,17 @@
 func (m *InterAdapterHeader) String() string { return proto.CompactTextString(m) }
 func (*InterAdapterHeader) ProtoMessage()    {}
 func (*InterAdapterHeader) Descriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{15}
+	return fileDescriptor_941f0031a549667f, []int{15}
 }
+
 func (m *InterAdapterHeader) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InterAdapterHeader.Unmarshal(m, b)
 }
 func (m *InterAdapterHeader) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InterAdapterHeader.Marshal(b, m, deterministic)
 }
-func (dst *InterAdapterHeader) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InterAdapterHeader.Merge(dst, src)
+func (m *InterAdapterHeader) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InterAdapterHeader.Merge(m, src)
 }
 func (m *InterAdapterHeader) XXX_Size() int {
 	return xxx_messageInfo_InterAdapterHeader.Size(m)
@@ -905,16 +929,17 @@
 func (m *InterAdapterOmciMessage) String() string { return proto.CompactTextString(m) }
 func (*InterAdapterOmciMessage) ProtoMessage()    {}
 func (*InterAdapterOmciMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{16}
+	return fileDescriptor_941f0031a549667f, []int{16}
 }
+
 func (m *InterAdapterOmciMessage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InterAdapterOmciMessage.Unmarshal(m, b)
 }
 func (m *InterAdapterOmciMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InterAdapterOmciMessage.Marshal(b, m, deterministic)
 }
-func (dst *InterAdapterOmciMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InterAdapterOmciMessage.Merge(dst, src)
+func (m *InterAdapterOmciMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InterAdapterOmciMessage.Merge(m, src)
 }
 func (m *InterAdapterOmciMessage) XXX_Size() int {
 	return xxx_messageInfo_InterAdapterOmciMessage.Size(m)
@@ -947,16 +972,17 @@
 func (m *InterAdapterResponseBody) String() string { return proto.CompactTextString(m) }
 func (*InterAdapterResponseBody) ProtoMessage()    {}
 func (*InterAdapterResponseBody) Descriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{17}
+	return fileDescriptor_941f0031a549667f, []int{17}
 }
+
 func (m *InterAdapterResponseBody) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InterAdapterResponseBody.Unmarshal(m, b)
 }
 func (m *InterAdapterResponseBody) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InterAdapterResponseBody.Marshal(b, m, deterministic)
 }
-func (dst *InterAdapterResponseBody) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InterAdapterResponseBody.Merge(dst, src)
+func (m *InterAdapterResponseBody) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InterAdapterResponseBody.Merge(m, src)
 }
 func (m *InterAdapterResponseBody) XXX_Size() int {
 	return xxx_messageInfo_InterAdapterResponseBody.Size(m)
@@ -1011,80 +1037,14 @@
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*InterAdapterResponseBody) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _InterAdapterResponseBody_OneofMarshaler, _InterAdapterResponseBody_OneofUnmarshaler, _InterAdapterResponseBody_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*InterAdapterResponseBody) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*InterAdapterResponseBody_Body)(nil),
 		(*InterAdapterResponseBody_Omci)(nil),
 	}
 }
 
-func _InterAdapterResponseBody_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*InterAdapterResponseBody)
-	// payload
-	switch x := m.Payload.(type) {
-	case *InterAdapterResponseBody_Body:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Body); err != nil {
-			return err
-		}
-	case *InterAdapterResponseBody_Omci:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Omci); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("InterAdapterResponseBody.Payload has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _InterAdapterResponseBody_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*InterAdapterResponseBody)
-	switch tag {
-	case 2: // payload.body
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(any.Any)
-		err := b.DecodeMessage(msg)
-		m.Payload = &InterAdapterResponseBody_Body{msg}
-		return true, err
-	case 3: // payload.omci
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InterAdapterOmciMessage)
-		err := b.DecodeMessage(msg)
-		m.Payload = &InterAdapterResponseBody_Omci{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _InterAdapterResponseBody_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*InterAdapterResponseBody)
-	// payload
-	switch x := m.Payload.(type) {
-	case *InterAdapterResponseBody_Body:
-		s := proto.Size(x.Body)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *InterAdapterResponseBody_Omci:
-		s := proto.Size(x.Omci)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 type InterAdapterMessage struct {
 	Header               *InterAdapterHeader `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"`
 	Body                 *any.Any            `protobuf:"bytes,2,opt,name=body,proto3" json:"body,omitempty"`
@@ -1097,16 +1057,17 @@
 func (m *InterAdapterMessage) String() string { return proto.CompactTextString(m) }
 func (*InterAdapterMessage) ProtoMessage()    {}
 func (*InterAdapterMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_inter_container_07f83a25f58b3d1d, []int{18}
+	return fileDescriptor_941f0031a549667f, []int{18}
 }
+
 func (m *InterAdapterMessage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InterAdapterMessage.Unmarshal(m, b)
 }
 func (m *InterAdapterMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InterAdapterMessage.Marshal(b, m, deterministic)
 }
-func (dst *InterAdapterMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InterAdapterMessage.Merge(dst, src)
+func (m *InterAdapterMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InterAdapterMessage.Merge(m, src)
 }
 func (m *InterAdapterMessage) XXX_Size() int {
 	return xxx_messageInfo_InterAdapterMessage.Size(m)
@@ -1132,6 +1093,9 @@
 }
 
 func init() {
+	proto.RegisterEnum("voltha.MessageType", MessageType_name, MessageType_value)
+	proto.RegisterEnum("voltha.ErrorCodeCodes", ErrorCodeCodes_name, ErrorCodeCodes_value)
+	proto.RegisterEnum("voltha.InterAdapterMessageType_Types", InterAdapterMessageType_Types_name, InterAdapterMessageType_Types_value)
 	proto.RegisterType((*StrType)(nil), "voltha.StrType")
 	proto.RegisterType((*IntType)(nil), "voltha.IntType")
 	proto.RegisterType((*BoolType)(nil), "voltha.BoolType")
@@ -1151,16 +1115,13 @@
 	proto.RegisterType((*InterAdapterOmciMessage)(nil), "voltha.InterAdapterOmciMessage")
 	proto.RegisterType((*InterAdapterResponseBody)(nil), "voltha.InterAdapterResponseBody")
 	proto.RegisterType((*InterAdapterMessage)(nil), "voltha.InterAdapterMessage")
-	proto.RegisterEnum("voltha.MessageType", MessageType_name, MessageType_value)
-	proto.RegisterEnum("voltha.ErrorCodeCodes", ErrorCodeCodes_name, ErrorCodeCodes_value)
-	proto.RegisterEnum("voltha.InterAdapterMessageType_Types", InterAdapterMessageType_Types_name, InterAdapterMessageType_Types_value)
 }
 
 func init() {
-	proto.RegisterFile("voltha_protos/inter_container.proto", fileDescriptor_inter_container_07f83a25f58b3d1d)
+	proto.RegisterFile("voltha_protos/inter_container.proto", fileDescriptor_941f0031a549667f)
 }
 
-var fileDescriptor_inter_container_07f83a25f58b3d1d = []byte{
+var fileDescriptor_941f0031a549667f = []byte{
 	// 1061 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xdb, 0x6e, 0xe3, 0x44,
 	0x18, 0xde, 0x9c, 0x93, 0x3f, 0xdd, 0x34, 0x9d, 0x6e, 0xbb, 0xe9, 0x01, 0xb5, 0x32, 0x7b, 0x28,