diff --git a/go/omci/omci_alarm_db.pb.go b/go/omci/omci_alarm_db.pb.go
index b7144d9..82776b6 100644
--- a/go/omci/omci_alarm_db.pb.go
+++ b/go/omci/omci_alarm_db.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: voltha_protos/omci_alarm_db.proto
 
-package omci // import "github.com/opencord/voltha-protos/go/omci"
+package omci
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/opencord/voltha-protos/go/common"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/opencord/voltha-protos/go/common"
+	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 AlarmOpenOmciEventType_OpenOmciEventType int32
 
@@ -28,6 +30,7 @@
 var AlarmOpenOmciEventType_OpenOmciEventType_name = map[int32]string{
 	0: "state_change",
 }
+
 var AlarmOpenOmciEventType_OpenOmciEventType_value = map[string]int32{
 	"state_change": 0,
 }
@@ -35,8 +38,9 @@
 func (x AlarmOpenOmciEventType_OpenOmciEventType) String() string {
 	return proto.EnumName(AlarmOpenOmciEventType_OpenOmciEventType_name, int32(x))
 }
+
 func (AlarmOpenOmciEventType_OpenOmciEventType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_omci_alarm_db_26c635f8b97d9376, []int{6, 0}
+	return fileDescriptor_8d41f1e38aadb08d, []int{6, 0}
 }
 
 type AlarmAttributeData struct {
@@ -51,16 +55,17 @@
 func (m *AlarmAttributeData) String() string { return proto.CompactTextString(m) }
 func (*AlarmAttributeData) ProtoMessage()    {}
 func (*AlarmAttributeData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_omci_alarm_db_26c635f8b97d9376, []int{0}
+	return fileDescriptor_8d41f1e38aadb08d, []int{0}
 }
+
 func (m *AlarmAttributeData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlarmAttributeData.Unmarshal(m, b)
 }
 func (m *AlarmAttributeData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AlarmAttributeData.Marshal(b, m, deterministic)
 }
-func (dst *AlarmAttributeData) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AlarmAttributeData.Merge(dst, src)
+func (m *AlarmAttributeData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlarmAttributeData.Merge(m, src)
 }
 func (m *AlarmAttributeData) XXX_Size() int {
 	return xxx_messageInfo_AlarmAttributeData.Size(m)
@@ -99,16 +104,17 @@
 func (m *AlarmInstanceData) String() string { return proto.CompactTextString(m) }
 func (*AlarmInstanceData) ProtoMessage()    {}
 func (*AlarmInstanceData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_omci_alarm_db_26c635f8b97d9376, []int{1}
+	return fileDescriptor_8d41f1e38aadb08d, []int{1}
 }
+
 func (m *AlarmInstanceData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlarmInstanceData.Unmarshal(m, b)
 }
 func (m *AlarmInstanceData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AlarmInstanceData.Marshal(b, m, deterministic)
 }
-func (dst *AlarmInstanceData) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AlarmInstanceData.Merge(dst, src)
+func (m *AlarmInstanceData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlarmInstanceData.Merge(m, src)
 }
 func (m *AlarmInstanceData) XXX_Size() int {
 	return xxx_messageInfo_AlarmInstanceData.Size(m)
@@ -159,16 +165,17 @@
 func (m *AlarmClassData) String() string { return proto.CompactTextString(m) }
 func (*AlarmClassData) ProtoMessage()    {}
 func (*AlarmClassData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_omci_alarm_db_26c635f8b97d9376, []int{2}
+	return fileDescriptor_8d41f1e38aadb08d, []int{2}
 }
+
 func (m *AlarmClassData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlarmClassData.Unmarshal(m, b)
 }
 func (m *AlarmClassData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AlarmClassData.Marshal(b, m, deterministic)
 }
-func (dst *AlarmClassData) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AlarmClassData.Merge(dst, src)
+func (m *AlarmClassData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlarmClassData.Merge(m, src)
 }
 func (m *AlarmClassData) XXX_Size() int {
 	return xxx_messageInfo_AlarmClassData.Size(m)
@@ -205,16 +212,17 @@
 func (m *AlarmManagedEntity) String() string { return proto.CompactTextString(m) }
 func (*AlarmManagedEntity) ProtoMessage()    {}
 func (*AlarmManagedEntity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_omci_alarm_db_26c635f8b97d9376, []int{3}
+	return fileDescriptor_8d41f1e38aadb08d, []int{3}
 }
+
 func (m *AlarmManagedEntity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlarmManagedEntity.Unmarshal(m, b)
 }
 func (m *AlarmManagedEntity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AlarmManagedEntity.Marshal(b, m, deterministic)
 }
-func (dst *AlarmManagedEntity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AlarmManagedEntity.Merge(dst, src)
+func (m *AlarmManagedEntity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlarmManagedEntity.Merge(m, src)
 }
 func (m *AlarmManagedEntity) XXX_Size() int {
 	return xxx_messageInfo_AlarmManagedEntity.Size(m)
@@ -250,16 +258,17 @@
 func (m *AlarmMessageType) String() string { return proto.CompactTextString(m) }
 func (*AlarmMessageType) ProtoMessage()    {}
 func (*AlarmMessageType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_omci_alarm_db_26c635f8b97d9376, []int{4}
+	return fileDescriptor_8d41f1e38aadb08d, []int{4}
 }
+
 func (m *AlarmMessageType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlarmMessageType.Unmarshal(m, b)
 }
 func (m *AlarmMessageType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AlarmMessageType.Marshal(b, m, deterministic)
 }
-func (dst *AlarmMessageType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AlarmMessageType.Merge(dst, src)
+func (m *AlarmMessageType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlarmMessageType.Merge(m, src)
 }
 func (m *AlarmMessageType) XXX_Size() int {
 	return xxx_messageInfo_AlarmMessageType.Size(m)
@@ -295,16 +304,17 @@
 func (m *AlarmDeviceData) String() string { return proto.CompactTextString(m) }
 func (*AlarmDeviceData) ProtoMessage()    {}
 func (*AlarmDeviceData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_omci_alarm_db_26c635f8b97d9376, []int{5}
+	return fileDescriptor_8d41f1e38aadb08d, []int{5}
 }
+
 func (m *AlarmDeviceData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlarmDeviceData.Unmarshal(m, b)
 }
 func (m *AlarmDeviceData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AlarmDeviceData.Marshal(b, m, deterministic)
 }
-func (dst *AlarmDeviceData) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AlarmDeviceData.Merge(dst, src)
+func (m *AlarmDeviceData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlarmDeviceData.Merge(m, src)
 }
 func (m *AlarmDeviceData) XXX_Size() int {
 	return xxx_messageInfo_AlarmDeviceData.Size(m)
@@ -381,16 +391,17 @@
 func (m *AlarmOpenOmciEventType) String() string { return proto.CompactTextString(m) }
 func (*AlarmOpenOmciEventType) ProtoMessage()    {}
 func (*AlarmOpenOmciEventType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_omci_alarm_db_26c635f8b97d9376, []int{6}
+	return fileDescriptor_8d41f1e38aadb08d, []int{6}
 }
+
 func (m *AlarmOpenOmciEventType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlarmOpenOmciEventType.Unmarshal(m, b)
 }
 func (m *AlarmOpenOmciEventType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AlarmOpenOmciEventType.Marshal(b, m, deterministic)
 }
-func (dst *AlarmOpenOmciEventType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AlarmOpenOmciEventType.Merge(dst, src)
+func (m *AlarmOpenOmciEventType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlarmOpenOmciEventType.Merge(m, src)
 }
 func (m *AlarmOpenOmciEventType) XXX_Size() int {
 	return xxx_messageInfo_AlarmOpenOmciEventType.Size(m)
@@ -413,16 +424,17 @@
 func (m *AlarmOpenOmciEvent) String() string { return proto.CompactTextString(m) }
 func (*AlarmOpenOmciEvent) ProtoMessage()    {}
 func (*AlarmOpenOmciEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_omci_alarm_db_26c635f8b97d9376, []int{7}
+	return fileDescriptor_8d41f1e38aadb08d, []int{7}
 }
+
 func (m *AlarmOpenOmciEvent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlarmOpenOmciEvent.Unmarshal(m, b)
 }
 func (m *AlarmOpenOmciEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AlarmOpenOmciEvent.Marshal(b, m, deterministic)
 }
-func (dst *AlarmOpenOmciEvent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AlarmOpenOmciEvent.Merge(dst, src)
+func (m *AlarmOpenOmciEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlarmOpenOmciEvent.Merge(m, src)
 }
 func (m *AlarmOpenOmciEvent) XXX_Size() int {
 	return xxx_messageInfo_AlarmOpenOmciEvent.Size(m)
@@ -448,6 +460,7 @@
 }
 
 func init() {
+	proto.RegisterEnum("alarm.AlarmOpenOmciEventType_OpenOmciEventType", AlarmOpenOmciEventType_OpenOmciEventType_name, AlarmOpenOmciEventType_OpenOmciEventType_value)
 	proto.RegisterType((*AlarmAttributeData)(nil), "alarm.AlarmAttributeData")
 	proto.RegisterType((*AlarmInstanceData)(nil), "alarm.AlarmInstanceData")
 	proto.RegisterType((*AlarmClassData)(nil), "alarm.AlarmClassData")
@@ -456,14 +469,11 @@
 	proto.RegisterType((*AlarmDeviceData)(nil), "alarm.AlarmDeviceData")
 	proto.RegisterType((*AlarmOpenOmciEventType)(nil), "alarm.AlarmOpenOmciEventType")
 	proto.RegisterType((*AlarmOpenOmciEvent)(nil), "alarm.AlarmOpenOmciEvent")
-	proto.RegisterEnum("alarm.AlarmOpenOmciEventType_OpenOmciEventType", AlarmOpenOmciEventType_OpenOmciEventType_name, AlarmOpenOmciEventType_OpenOmciEventType_value)
 }
 
-func init() {
-	proto.RegisterFile("voltha_protos/omci_alarm_db.proto", fileDescriptor_omci_alarm_db_26c635f8b97d9376)
-}
+func init() { proto.RegisterFile("voltha_protos/omci_alarm_db.proto", fileDescriptor_8d41f1e38aadb08d) }
 
-var fileDescriptor_omci_alarm_db_26c635f8b97d9376 = []byte{
+var fileDescriptor_8d41f1e38aadb08d = []byte{
 	// 595 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcf, 0x6a, 0xdb, 0x4e,
 	0x10, 0xfe, 0x39, 0xb1, 0x13, 0x67, 0x6c, 0x27, 0xce, 0xfe, 0xfa, 0x67, 0x13, 0x08, 0xa4, 0xa2,