diff --git a/api/bbsim/bbsim.pb.go b/api/bbsim/bbsim.pb.go
index d6e86a0..ba67479 100644
--- a/api/bbsim/bbsim.pb.go
+++ b/api/bbsim/bbsim.pb.go
@@ -7,8 +7,8 @@
 	context "context"
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	openolt "github.com/opencord/voltha-protos/v2/go/openolt"
-	tech_profile "github.com/opencord/voltha-protos/v2/go/tech_profile"
+	openolt "github.com/opencord/voltha-protos/v3/go/openolt"
+	tech_profile "github.com/opencord/voltha-protos/v3/go/tech_profile"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -423,6 +423,7 @@
 	EapolState           string   `protobuf:"bytes,10,opt,name=EapolState,proto3" json:"EapolState,omitempty"`
 	DhcpState            string   `protobuf:"bytes,11,opt,name=DhcpState,proto3" json:"DhcpState,omitempty"`
 	InternalState        string   `protobuf:"bytes,12,opt,name=InternalState,proto3" json:"InternalState,omitempty"`
+	IGMPState            string   `protobuf:"bytes,13,opt,name=IGMPState,proto3" json:"IGMPState,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -537,6 +538,13 @@
 	return ""
 }
 
+func (m *Service) GetIGMPState() string {
+	if m != nil {
+		return m.IGMPState
+	}
+	return ""
+}
+
 type ONUTrafficSchedulers struct {
 	TraffSchedulers      *tech_profile.TrafficSchedulers `protobuf:"bytes,1,opt,name=traffSchedulers,proto3" json:"traffSchedulers,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}                        `json:"-"`
@@ -1242,102 +1250,102 @@
 func init() { proto.RegisterFile("api/bbsim/bbsim.proto", fileDescriptor_ef7750073d18011b) }
 
 var fileDescriptor_ef7750073d18011b = []byte{
-	// 1508 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xcd, 0x6e, 0xdb, 0xc6,
-	0x16, 0xd6, 0x8f, 0xf5, 0x77, 0x64, 0xc9, 0xf4, 0x24, 0x76, 0x08, 0xc7, 0xf7, 0x46, 0xe0, 0xcd,
-	0xbd, 0x70, 0x82, 0x1b, 0xa7, 0xb1, 0xfb, 0x93, 0x2c, 0x69, 0x89, 0x56, 0x58, 0xcb, 0x43, 0x61,
-	0x28, 0x39, 0xc8, 0x8a, 0xa0, 0xa5, 0xb1, 0x4d, 0x80, 0x22, 0x15, 0x92, 0xb2, 0x91, 0x07, 0xe8,
-	0x8b, 0xf4, 0x65, 0xba, 0x2d, 0xd0, 0x7d, 0x77, 0x7d, 0x8c, 0x02, 0xc5, 0x0c, 0x87, 0x14, 0x69,
-	0x29, 0x85, 0xdb, 0x4d, 0x37, 0x02, 0xcf, 0x77, 0xfe, 0xcf, 0x99, 0x39, 0x67, 0x04, 0x3b, 0xf6,
-	0xdc, 0x79, 0x7d, 0x79, 0x19, 0x3a, 0xb3, 0xf8, 0xf7, 0x70, 0x1e, 0xf8, 0x91, 0x8f, 0x2a, 0x9c,
-	0xd8, 0x7b, 0x7a, 0xeb, 0xbb, 0xd1, 0x8d, 0x6d, 0x71, 0x30, 0x7c, 0xed, 0xcf, 0xa9, 0xe7, 0xbb,
-	0x51, 0x2c, 0xb3, 0xd7, 0xc9, 0x33, 0x23, 0x3a, 0xb9, 0x61, 0xdf, 0x57, 0x8e, 0x4b, 0x63, 0x09,
-	0xe5, 0x3b, 0xa8, 0x0d, 0x0d, 0x3c, 0xf4, 0x83, 0x08, 0xb5, 0xa1, 0xa4, 0xf7, 0xe4, 0x62, 0xa7,
-	0x78, 0x50, 0x21, 0x25, 0xbd, 0x87, 0xf6, 0xa1, 0x61, 0xcc, 0x69, 0x60, 0x46, 0x76, 0x44, 0xe5,
-	0x52, 0xa7, 0x78, 0xd0, 0x20, 0x4b, 0x80, 0x29, 0x62, 0xac, 0xff, 0x0d, 0xc5, 0xdf, 0x8a, 0x50,
-	0x36, 0xdc, 0x55, 0x2d, 0x05, 0x36, 0x4d, 0x1a, 0x38, 0xb6, 0x8b, 0x17, 0xb3, 0x4b, 0x1a, 0x08,
-	0xc5, 0x1c, 0x96, 0xb7, 0x5c, 0xbe, 0x67, 0x19, 0x3d, 0x87, 0x96, 0xee, 0x45, 0x34, 0xf0, 0x6c,
-	0x37, 0x96, 0xd8, 0xe0, 0x12, 0x79, 0x90, 0xfb, 0x1d, 0xca, 0x35, 0xce, 0x2a, 0xe9, 0x43, 0xf4,
-	0x12, 0xea, 0x22, 0x91, 0x50, 0xae, 0x74, 0xca, 0x07, 0xcd, 0xa3, 0xf6, 0x61, 0x5c, 0x67, 0x01,
-	0x93, 0x94, 0xcf, 0x64, 0x45, 0xb5, 0x42, 0xb9, 0x9a, 0x93, 0x15, 0x30, 0x49, 0xf9, 0xca, 0xef,
-	0x2c, 0x4f, 0x3c, 0xfe, 0xc7, 0xf2, 0xdc, 0x87, 0xc6, 0xd0, 0xf7, 0x58, 0x2c, 0x7a, 0x4f, 0xae,
-	0x70, 0xf7, 0x4b, 0x80, 0x71, 0xdf, 0xdf, 0xa9, 0xd3, 0x69, 0x40, 0xc3, 0x50, 0xae, 0xc7, 0x1e,
-	0x52, 0x00, 0xed, 0x42, 0x95, 0xc9, 0x61, 0x5f, 0x6e, 0x70, 0x45, 0x41, 0xb1, 0xfc, 0x43, 0x1a,
-	0xdc, 0x3a, 0x13, 0x1a, 0xca, 0x90, 0xcb, 0xdf, 0x8c, 0x61, 0x92, 0xf2, 0x95, 0x5f, 0x4a, 0x50,
-	0x13, 0x28, 0x42, 0xb0, 0x81, 0xed, 0x19, 0xe5, 0x55, 0x68, 0x10, 0xfe, 0x9d, 0x8f, 0xa0, 0x74,
-	0x3f, 0x82, 0xc7, 0x50, 0x31, 0xbc, 0x85, 0xe9, 0x89, 0xec, 0x63, 0x82, 0xd9, 0x31, 0x47, 0xf6,
-	0x35, 0x4f, 0xb8, 0x42, 0xf8, 0x37, 0xc3, 0xba, 0x0c, 0x8b, 0x53, 0xe4, 0xdf, 0xe8, 0xdf, 0x00,
-	0x98, 0xd2, 0x69, 0xa8, 0xd9, 0x73, 0xdf, 0x95, 0xab, 0x9d, 0xe2, 0x41, 0x9d, 0x64, 0x10, 0xe6,
-	0x9b, 0x53, 0xbd, 0x9b, 0xc9, 0x9c, 0x1f, 0x85, 0x3a, 0x59, 0x02, 0x29, 0x57, 0xbf, 0x9e, 0xcd,
-	0x79, 0x6d, 0x12, 0x2e, 0x03, 0x90, 0x0c, 0xb5, 0x3e, 0x9d, 0xb1, 0x82, 0x88, 0xe2, 0x24, 0x24,
-	0xf3, 0xca, 0xcd, 0xc7, 0x4d, 0x01, 0x1e, 0x78, 0x06, 0x61, 0x76, 0x99, 0xfd, 0x98, 0xdd, 0x8c,
-	0x33, 0x4e, 0x81, 0xd5, 0xae, 0x6e, 0xae, 0xe9, 0xaa, 0x62, 0xc3, 0x63, 0x03, 0x8f, 0x47, 0x81,
-	0x7d, 0x75, 0xe5, 0x4c, 0xcc, 0xc9, 0x0d, 0x9d, 0x2e, 0x5c, 0x1a, 0x84, 0x48, 0x87, 0xad, 0x88,
-	0x81, 0x4b, 0x88, 0x17, 0xbb, 0x79, 0xf4, 0xec, 0x30, 0x77, 0xeb, 0x57, 0x34, 0xc9, 0x7d, 0x3d,
-	0xe5, 0x00, 0x36, 0x0c, 0x3c, 0x0e, 0x51, 0x07, 0x2a, 0x4e, 0x44, 0x67, 0xcc, 0x10, 0xeb, 0x34,
-	0x88, 0x4e, 0x1b, 0x78, 0x4c, 0x62, 0x86, 0xf2, 0x15, 0xd4, 0x45, 0x87, 0x43, 0xf4, 0x3c, 0x2f,
-	0x7d, 0xff, 0x5c, 0xa4, 0x1a, 0xc0, 0xf4, 0xe9, 0xa7, 0x05, 0x0d, 0xa3, 0x95, 0xab, 0x50, 0x5c,
-	0xbd, 0x0a, 0xca, 0x4b, 0x80, 0xa1, 0x81, 0x13, 0x8d, 0xcc, 0xa1, 0x9e, 0x72, 0xf1, 0xd6, 0xf2,
-	0x50, 0x4f, 0x95, 0x5f, 0xcb, 0xd0, 0x50, 0x5d, 0x3b, 0x98, 0x8d, 0x3e, 0xcf, 0xa9, 0xf2, 0x73,
-	0x19, 0x2a, 0xec, 0x23, 0x44, 0x35, 0x28, 0x0f, 0x0c, 0x53, 0x2a, 0xa0, 0x36, 0x40, 0xef, 0xa3,
-	0x8e, 0xfb, 0x56, 0x5f, 0x35, 0x87, 0x52, 0x11, 0xb5, 0xa0, 0x61, 0xe0, 0xb1, 0xa5, 0x0e, 0x54,
-	0x72, 0x2e, 0x95, 0xd0, 0x13, 0x78, 0xc4, 0x48, 0x73, 0xa4, 0x92, 0xd1, 0x78, 0x68, 0x9d, 0xaa,
-	0xfa, 0x60, 0x4c, 0x34, 0xa9, 0x8c, 0x76, 0x01, 0x71, 0x86, 0xde, 0xc7, 0xea, 0xc0, 0xea, 0x69,
-	0x7d, 0xa2, 0xf6, 0x34, 0x69, 0x23, 0x51, 0xe8, 0x11, 0xfd, 0x74, 0x64, 0x19, 0xa7, 0xd6, 0x07,
-	0x1d, 0xf7, 0x8c, 0x0f, 0x52, 0x05, 0xed, 0x83, 0xcc, 0x18, 0x03, 0xc3, 0x34, 0x19, 0x6e, 0x9c,
-	0x77, 0x75, 0xab, 0xfb, 0x5e, 0xc5, 0x58, 0x1b, 0x48, 0xd5, 0xd4, 0x0f, 0x37, 0x67, 0xa6, 0x7e,
-	0x6a, 0xe8, 0x05, 0xfc, 0x97, 0x31, 0x46, 0x44, 0xc5, 0xe6, 0xb9, 0x6e, 0x9a, 0xba, 0x81, 0x2d,
-	0x1d, 0x8f, 0x34, 0x72, 0xaa, 0x11, 0x0d, 0x77, 0x35, 0xeb, 0x83, 0x4a, 0xb0, 0x8e, 0xfb, 0x52,
-	0x1d, 0xed, 0xc1, 0x2e, 0x0f, 0xbd, 0x3b, 0xd2, 0x2f, 0xd4, 0x11, 0x13, 0x4c, 0xcc, 0x34, 0x90,
-	0xcc, 0x0f, 0x89, 0x35, 0x24, 0x46, 0x57, 0x33, 0x4d, 0x96, 0xaf, 0x46, 0x88, 0x41, 0x24, 0x40,
-	0x1d, 0xd8, 0xcf, 0xc6, 0x75, 0xa6, 0x7d, 0xb4, 0xcc, 0x8f, 0xb8, 0x9b, 0xea, 0x36, 0xd1, 0x0e,
-	0x6c, 0x33, 0x09, 0x7d, 0x34, 0xb6, 0x86, 0x06, 0x66, 0xb5, 0x18, 0x99, 0xd2, 0x26, 0xda, 0x86,
-	0x56, 0x5a, 0x29, 0xa6, 0x2e, 0xb5, 0xee, 0x43, 0x27, 0x52, 0x3b, 0x49, 0x2c, 0x81, 0x86, 0x5d,
-	0x8b, 0x65, 0x21, 0x6d, 0x25, 0xf5, 0xc8, 0x31, 0xba, 0x22, 0x2a, 0x09, 0x21, 0x68, 0x67, 0xb9,
-	0xa7, 0xba, 0xb4, 0x8d, 0x1e, 0xc1, 0x56, 0x16, 0x53, 0xcf, 0x75, 0x09, 0x29, 0x6f, 0xa1, 0xcd,
-	0xfb, 0x3b, 0xb4, 0x03, 0x7b, 0x46, 0x23, 0x1a, 0x20, 0x09, 0xca, 0x67, 0xf4, 0xb3, 0x38, 0x39,
-	0xec, 0x93, 0x4d, 0x8e, 0x0b, 0xdb, 0x5d, 0x24, 0x9b, 0x27, 0x26, 0x94, 0x1f, 0x8b, 0xdc, 0x1e,
-	0xd7, 0xce, 0x1c, 0xa6, 0xf4, 0xb4, 0x08, 0x0b, 0x4b, 0xe0, 0x41, 0x73, 0x7a, 0x17, 0xaa, 0xec,
-	0x5a, 0x2e, 0x42, 0x31, 0xa6, 0x04, 0x85, 0xbe, 0x01, 0x48, 0x43, 0x0c, 0xe5, 0x0d, 0x7e, 0x23,
-	0x76, 0xc4, 0x8d, 0xc8, 0x27, 0x40, 0x32, 0x82, 0xca, 0x27, 0xd8, 0x32, 0x06, 0xa3, 0x5c, 0x8c,
-	0x1d, 0x68, 0xf2, 0x01, 0x70, 0x65, 0x4f, 0xa8, 0x58, 0x23, 0x2d, 0x92, 0x85, 0xd2, 0xb9, 0xc1,
-	0x48, 0x9e, 0x49, 0x29, 0x33, 0x37, 0x12, 0xf0, 0x4b, 0x91, 0x2a, 0x3f, 0x14, 0xa1, 0x75, 0x41,
-	0x83, 0xd0, 0xf1, 0x3d, 0x91, 0x93, 0x0c, 0xb5, 0xdb, 0x18, 0x10, 0x35, 0x49, 0x48, 0x56, 0xaf,
-	0xcb, 0x85, 0xe3, 0x4e, 0x47, 0xce, 0x2c, 0xdd, 0xeb, 0x29, 0xc0, 0xa6, 0xdf, 0xc4, 0x9f, 0xcd,
-	0x9c, 0xe8, 0xbd, 0x1d, 0xde, 0x08, 0x2f, 0x19, 0x84, 0x69, 0x5f, 0x3b, 0x91, 0x08, 0x22, 0xde,
-	0x58, 0x4b, 0x40, 0x79, 0x0b, 0xf5, 0x81, 0x7f, 0x3d, 0xa0, 0xb7, 0xd4, 0x65, 0x1d, 0x74, 0xd9,
-	0x87, 0xf0, 0x1f, 0x13, 0x2c, 0x83, 0x89, 0xed, 0xba, 0xa2, 0x13, 0x75, 0x22, 0x28, 0x45, 0x83,
-	0x3a, 0xa1, 0xe1, 0xdc, 0xf7, 0x42, 0x8a, 0x9e, 0x41, 0x33, 0xe4, 0xf6, 0xac, 0x89, 0x3f, 0xa5,
-	0x62, 0xe9, 0x42, 0x0c, 0x75, 0xfd, 0x29, 0x65, 0xc9, 0xcd, 0x68, 0x18, 0xda, 0xd7, 0x49, 0x02,
-	0x09, 0xa9, 0x84, 0xd0, 0x64, 0xe3, 0x3d, 0xa9, 0xfb, 0x0b, 0xa8, 0x1a, 0xde, 0x82, 0xd0, 0x4f,
-	0x62, 0x8c, 0x6e, 0x67, 0xa6, 0x5f, 0x2c, 0x42, 0x84, 0x00, 0x7a, 0x07, 0x9b, 0xe6, 0xe2, 0x52,
-	0x9d, 0x44, 0x8e, 0xef, 0x5d, 0xd8, 0x2e, 0x37, 0xdc, 0x4e, 0xdb, 0x9d, 0xb2, 0xf8, 0x28, 0x22,
-	0x39, 0x51, 0xe5, 0x0c, 0x2a, 0xa7, 0xae, 0x7f, 0x17, 0xa2, 0x7f, 0x01, 0x5c, 0xb9, 0xfe, 0x9d,
-	0x35, 0xf1, 0x17, 0x5e, 0x94, 0x0c, 0x36, 0x86, 0x74, 0x19, 0x80, 0xfe, 0x03, 0x15, 0x46, 0xb0,
-	0x3d, 0xc9, 0x8e, 0x52, 0xeb, 0x30, 0x79, 0xe6, 0x31, 0x6d, 0x12, 0xf3, 0x94, 0x1a, 0x54, 0xb4,
-	0xd9, 0x3c, 0xfa, 0xfc, 0xf2, 0x0d, 0xb4, 0xf3, 0x5e, 0x51, 0x1d, 0x36, 0xbe, 0x37, 0x74, 0x2c,
-	0x15, 0x50, 0x03, 0x2a, 0x03, 0x4d, 0xbd, 0xd0, 0xa4, 0x22, 0x02, 0xa8, 0x32, 0xf0, 0xe2, 0x58,
-	0x2a, 0x1d, 0xfd, 0xd4, 0x80, 0xca, 0xc9, 0x89, 0xe9, 0xcc, 0xd0, 0x6b, 0xa8, 0x89, 0xf3, 0x80,
-	0x36, 0x45, 0x0a, 0xdc, 0xea, 0xde, 0x63, 0x41, 0xe5, 0x4e, 0x8b, 0x52, 0x40, 0x6f, 0xa0, 0x69,
-	0xd2, 0x28, 0x6d, 0xde, 0x96, 0x10, 0x4b, 0x80, 0xbd, 0xfb, 0x80, 0x52, 0x40, 0xcf, 0xa1, 0xda,
-	0xa7, 0x11, 0x7b, 0x04, 0xe6, 0x5d, 0xa4, 0x2b, 0xc6, 0x8d, 0x94, 0x02, 0x7a, 0x05, 0x30, 0xf4,
-	0xef, 0x68, 0xe0, 0x7b, 0xab, 0x92, 0x89, 0xd1, 0xa4, 0xf3, 0x4a, 0x01, 0x1d, 0x42, 0xd3, 0xbc,
-	0x59, 0x44, 0x53, 0xff, 0xee, 0x61, 0xf2, 0xff, 0x87, 0x06, 0xa1, 0x97, 0xbe, 0x1f, 0x3d, 0x48,
-	0xfa, 0x45, 0x1c, 0x32, 0x1e, 0xa3, 0xd5, 0x93, 0xb0, 0x97, 0x59, 0x8d, 0x4a, 0x01, 0xfd, 0x8f,
-	0x3d, 0x10, 0x22, 0xbe, 0x42, 0xf3, 0x66, 0x9b, 0x4b, 0xb1, 0x30, 0x0e, 0xb8, 0x4f, 0xa3, 0x74,
-	0x81, 0xae, 0x0f, 0x21, 0x61, 0x2b, 0x05, 0xf4, 0x2d, 0xb4, 0x99, 0x5d, 0x6f, 0x91, 0xaa, 0xac,
-	0x09, 0x65, 0x8d, 0xde, 0x71, 0xa6, 0x30, 0xeb, 0xe3, 0x5f, 0x93, 0xef, 0x11, 0x6c, 0x25, 0x4a,
-	0xaa, 0xeb, 0xae, 0x49, 0x66, 0x8d, 0xce, 0x3b, 0xd8, 0xce, 0x38, 0x0a, 0x0d, 0x6f, 0x68, 0xe0,
-	0xd4, 0xdd, 0x72, 0x89, 0xaf, 0x77, 0x97, 0xf6, 0xfa, 0xc1, 0x21, 0xbe, 0x81, 0xb6, 0xd0, 0x79,
-	0x70, 0x84, 0x6f, 0x41, 0x5a, 0xba, 0xf9, 0x4b, 0x01, 0x7e, 0x0d, 0x9b, 0x84, 0x86, 0x91, 0x1d,
-	0x44, 0xf1, 0x0b, 0xf2, 0x61, 0x21, 0x1e, 0x43, 0x53, 0x68, 0xf1, 0x87, 0xe5, 0xc3, 0x94, 0x4e,
-	0x60, 0xc7, 0xe4, 0x7d, 0xe6, 0x8b, 0x40, 0xf7, 0xa6, 0xce, 0xc4, 0x66, 0x57, 0x19, 0xed, 0x2e,
-	0xd5, 0xb3, 0x3b, 0xe2, 0x4f, 0x6c, 0xb8, 0xd1, 0x17, 0x6d, 0xe4, 0xf7, 0xcc, 0x3a, 0x1b, 0xaf,
-	0xa0, 0xde, 0xa7, 0x51, 0x3c, 0x9f, 0xd6, 0x44, 0x9e, 0x14, 0x9b, 0x0b, 0xf0, 0xda, 0x6e, 0x75,
-	0x6f, 0x6c, 0xef, 0x9a, 0xb2, 0x31, 0x1a, 0x3f, 0x69, 0x91, 0x10, 0xc9, 0x0c, 0xd6, 0x75, 0x8e,
-	0xce, 0xe0, 0x49, 0x7c, 0xb0, 0x57, 0x9f, 0xb5, 0x6b, 0xfc, 0x3e, 0x5d, 0x42, 0x2b, 0xf2, 0x4a,
-	0xe1, 0xb2, 0xca, 0xff, 0xd7, 0x1e, 0xff, 0x11, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x5c, 0x3f, 0xfa,
-	0x36, 0x0f, 0x00, 0x00,
+	// 1519 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xdd, 0x6e, 0xdb, 0xc6,
+	0x12, 0xd6, 0x8f, 0xf5, 0x37, 0xb2, 0x64, 0x7a, 0x13, 0x3b, 0x82, 0xe3, 0x73, 0x22, 0xf0, 0xe4,
+	0x1c, 0x38, 0xc1, 0x89, 0xd3, 0xd8, 0xfd, 0x49, 0x2e, 0x69, 0x89, 0x56, 0x58, 0xcb, 0x4b, 0x62,
+	0x29, 0x39, 0xc8, 0x15, 0x41, 0x4b, 0x6b, 0x9b, 0x00, 0x45, 0x2a, 0x24, 0x65, 0x23, 0x0f, 0xd0,
+	0x17, 0xe9, 0xcb, 0xf4, 0xb6, 0x4f, 0xd0, 0xbb, 0x3e, 0x40, 0x1f, 0xa0, 0x40, 0xb1, 0xcb, 0x25,
+	0x45, 0x5a, 0x4a, 0xe1, 0xf6, 0xa6, 0x37, 0xc2, 0xce, 0x37, 0xff, 0xb3, 0xc3, 0x99, 0x15, 0xec,
+	0xd8, 0x73, 0xe7, 0xf5, 0xe5, 0x65, 0xe8, 0xcc, 0xe2, 0xdf, 0xc3, 0x79, 0xe0, 0x47, 0x3e, 0xaa,
+	0x70, 0x62, 0xef, 0xe9, 0xad, 0xef, 0x46, 0x37, 0xb6, 0xc5, 0xc1, 0xf0, 0xb5, 0x3f, 0xa7, 0x9e,
+	0xef, 0x46, 0xb1, 0xcc, 0x5e, 0x37, 0xcf, 0x8c, 0xe8, 0xe4, 0x86, 0x9d, 0xaf, 0x1c, 0x97, 0xc6,
+	0x12, 0xf2, 0x77, 0x50, 0x33, 0x74, 0x6c, 0xf8, 0x41, 0x84, 0xda, 0x50, 0xd2, 0xfa, 0x9d, 0x62,
+	0xb7, 0x78, 0x50, 0x21, 0x25, 0xad, 0x8f, 0xf6, 0xa1, 0xa1, 0xcf, 0x69, 0x60, 0x46, 0x76, 0x44,
+	0x3b, 0xa5, 0x6e, 0xf1, 0xa0, 0x41, 0x96, 0x00, 0x53, 0xc4, 0x58, 0xfb, 0x1b, 0x8a, 0xbf, 0x16,
+	0xa1, 0xac, 0xbb, 0xab, 0x5a, 0x32, 0x6c, 0x9a, 0x34, 0x70, 0x6c, 0x17, 0x2f, 0x66, 0x97, 0x34,
+	0x10, 0x8a, 0x39, 0x2c, 0x6f, 0xb9, 0x7c, 0xcf, 0x32, 0x7a, 0x0e, 0x2d, 0xcd, 0x8b, 0x68, 0xe0,
+	0xd9, 0x6e, 0x2c, 0xb1, 0xc1, 0x25, 0xf2, 0x20, 0xf7, 0x6b, 0x74, 0x6a, 0x9c, 0x55, 0xd2, 0x0c,
+	0xf4, 0x12, 0xea, 0x22, 0x91, 0xb0, 0x53, 0xe9, 0x96, 0x0f, 0x9a, 0x47, 0xed, 0xc3, 0xb8, 0xce,
+	0x02, 0x26, 0x29, 0x9f, 0xc9, 0x8a, 0x6a, 0x85, 0x9d, 0x6a, 0x4e, 0x56, 0xc0, 0x24, 0xe5, 0xcb,
+	0xbf, 0xb3, 0x3c, 0xf1, 0xf8, 0x1f, 0xcb, 0x73, 0x1f, 0x1a, 0x86, 0xef, 0xb1, 0x58, 0xb4, 0x7e,
+	0xa7, 0xc2, 0xdd, 0x2f, 0x01, 0xc6, 0x7d, 0x7f, 0xa7, 0x4c, 0xa7, 0x01, 0x0d, 0xc3, 0x4e, 0x3d,
+	0xf6, 0x90, 0x02, 0x68, 0x17, 0xaa, 0x4c, 0x0e, 0xfb, 0x9d, 0x06, 0x57, 0x14, 0x14, 0xcb, 0x3f,
+	0xa4, 0xc1, 0xad, 0x33, 0xa1, 0x61, 0x07, 0x72, 0xf9, 0x9b, 0x31, 0x4c, 0x52, 0xbe, 0xfc, 0x5b,
+	0x09, 0x6a, 0x02, 0x45, 0x08, 0x36, 0xb0, 0x3d, 0xa3, 0xbc, 0x0a, 0x0d, 0xc2, 0xcf, 0xf9, 0x08,
+	0x4a, 0xf7, 0x23, 0x78, 0x0c, 0x15, 0xdd, 0x5b, 0x98, 0x9e, 0xc8, 0x3e, 0x26, 0x98, 0x1d, 0x73,
+	0x64, 0x5f, 0xf3, 0x84, 0x2b, 0x84, 0x9f, 0x19, 0xd6, 0x63, 0x58, 0x9c, 0x22, 0x3f, 0xa3, 0x7f,
+	0x03, 0x60, 0x4a, 0xa7, 0xa1, 0x6a, 0xcf, 0x7d, 0xb7, 0x53, 0xed, 0x16, 0x0f, 0xea, 0x24, 0x83,
+	0x30, 0xdf, 0x9c, 0xea, 0xdf, 0x4c, 0xe6, 0xbc, 0x15, 0xea, 0x64, 0x09, 0xa4, 0x5c, 0xed, 0x7a,
+	0x36, 0xe7, 0xb5, 0x49, 0xb8, 0x0c, 0x40, 0x1d, 0xa8, 0x0d, 0xe8, 0x8c, 0x15, 0x44, 0x14, 0x27,
+	0x21, 0x99, 0x57, 0x6e, 0x3e, 0xbe, 0x14, 0xe0, 0x81, 0x67, 0x10, 0x66, 0x97, 0xd9, 0x8f, 0xd9,
+	0xcd, 0x38, 0xe3, 0x14, 0x58, 0xbd, 0xd5, 0xcd, 0x2f, 0xdc, 0xaa, 0x36, 0x38, 0x37, 0x62, 0x89,
+	0x56, 0x6c, 0x23, 0x05, 0x64, 0x1b, 0x1e, 0xeb, 0x78, 0x3c, 0x0a, 0xec, 0xab, 0x2b, 0x67, 0x62,
+	0x4e, 0x6e, 0xe8, 0x74, 0xe1, 0xd2, 0x20, 0x44, 0x1a, 0x6c, 0x45, 0x0c, 0x5c, 0x42, 0xfc, 0x2a,
+	0x9a, 0x47, 0xcf, 0x0e, 0x73, 0x33, 0x61, 0x45, 0x93, 0xdc, 0xd7, 0x93, 0x0f, 0x60, 0x43, 0xc7,
+	0xe3, 0x10, 0x75, 0xa1, 0xe2, 0x44, 0x74, 0xc6, 0x0c, 0xb1, 0x3e, 0x00, 0xd1, 0x07, 0x3a, 0x1e,
+	0x93, 0x98, 0x21, 0x7f, 0x05, 0x75, 0x71, 0xff, 0x21, 0x7a, 0x9e, 0x97, 0xbe, 0xdf, 0x35, 0xa9,
+	0x06, 0x30, 0x7d, 0xfa, 0x69, 0x41, 0xc3, 0x68, 0xe5, 0x43, 0x29, 0xae, 0x7e, 0x28, 0xf2, 0x4b,
+	0x00, 0x43, 0xc7, 0x89, 0x46, 0xa6, 0xe5, 0xa7, 0x5c, 0xbc, 0xb5, 0x6c, 0xf9, 0xa9, 0xfc, 0x4b,
+	0x19, 0x1a, 0x8a, 0x6b, 0x07, 0xb3, 0xd1, 0xe7, 0x39, 0x95, 0x7f, 0x2e, 0x43, 0x85, 0x1d, 0x42,
+	0x54, 0x83, 0xf2, 0x50, 0x37, 0xa5, 0x02, 0x6a, 0x03, 0xf4, 0x3f, 0x6a, 0x78, 0x60, 0x0d, 0x14,
+	0xd3, 0x90, 0x8a, 0xa8, 0x05, 0x0d, 0x1d, 0x8f, 0x2d, 0x65, 0xa8, 0x90, 0x73, 0xa9, 0x84, 0x9e,
+	0xc0, 0x23, 0x46, 0x9a, 0x23, 0x85, 0x8c, 0xc6, 0x86, 0x75, 0xaa, 0x68, 0xc3, 0x31, 0x51, 0xa5,
+	0x32, 0xda, 0x05, 0xc4, 0x19, 0xda, 0x00, 0x2b, 0x43, 0xab, 0xaf, 0x0e, 0x88, 0xd2, 0x57, 0xa5,
+	0x8d, 0x44, 0xa1, 0x4f, 0xb4, 0xd3, 0x91, 0xa5, 0x9f, 0x5a, 0x1f, 0x34, 0xdc, 0xd7, 0x3f, 0x48,
+	0x15, 0xb4, 0x0f, 0x1d, 0xc6, 0x18, 0xea, 0xa6, 0xc9, 0x70, 0xfd, 0xbc, 0xa7, 0x59, 0xbd, 0xf7,
+	0x0a, 0xc6, 0xea, 0x50, 0xaa, 0xa6, 0x7e, 0xb8, 0x39, 0x33, 0xf5, 0x53, 0x43, 0x2f, 0xe0, 0xbf,
+	0x8c, 0x31, 0x22, 0x0a, 0x36, 0xcf, 0x35, 0xd3, 0xd4, 0x74, 0x6c, 0x69, 0x78, 0xa4, 0x92, 0x53,
+	0x95, 0xa8, 0xb8, 0xa7, 0x5a, 0x1f, 0x14, 0x82, 0x35, 0x3c, 0x90, 0xea, 0x68, 0x0f, 0x76, 0x79,
+	0xe8, 0xbd, 0x91, 0x76, 0xa1, 0x8c, 0x98, 0x60, 0x62, 0xa6, 0x81, 0x3a, 0xbc, 0x49, 0x2c, 0x83,
+	0xe8, 0x3d, 0xd5, 0x34, 0x59, 0xbe, 0x2a, 0x21, 0x3a, 0x91, 0x00, 0x75, 0x61, 0x3f, 0x1b, 0xd7,
+	0x99, 0xfa, 0xd1, 0x32, 0x3f, 0xe2, 0x5e, 0xaa, 0xdb, 0x44, 0x3b, 0xb0, 0xcd, 0x24, 0xb4, 0xd1,
+	0xd8, 0x32, 0x74, 0xcc, 0x6a, 0x31, 0x32, 0xa5, 0x4d, 0xb4, 0x0d, 0xad, 0xb4, 0x52, 0x4c, 0x5d,
+	0x6a, 0xdd, 0x87, 0x4e, 0xa4, 0x76, 0x92, 0x58, 0x02, 0x19, 0x3d, 0x8b, 0x65, 0x21, 0x6d, 0x25,
+	0xf5, 0xc8, 0x31, 0x7a, 0x22, 0x2a, 0x09, 0x21, 0x68, 0x67, 0xb9, 0xa7, 0x9a, 0xb4, 0x8d, 0x1e,
+	0xc1, 0x56, 0x16, 0x53, 0xce, 0x35, 0x09, 0xc9, 0x6f, 0xa1, 0xcd, 0xef, 0xd7, 0xb0, 0x03, 0x7b,
+	0x46, 0x23, 0x1a, 0x20, 0x09, 0xca, 0x67, 0xf4, 0xb3, 0xe8, 0x1c, 0x76, 0x64, 0x73, 0xe5, 0xc2,
+	0x76, 0x17, 0xc9, 0x5e, 0x8a, 0x09, 0xf9, 0xc7, 0x22, 0xb7, 0xc7, 0xb5, 0x33, 0xcd, 0x94, 0x76,
+	0x8b, 0xb0, 0xb0, 0x04, 0x1e, 0x34, 0xc5, 0x77, 0xa1, 0xca, 0x3e, 0xcb, 0x45, 0x28, 0x86, 0x98,
+	0xa0, 0xd0, 0x37, 0x00, 0x69, 0x88, 0x61, 0x67, 0x83, 0x7f, 0x11, 0x3b, 0xe2, 0x8b, 0xc8, 0x27,
+	0x40, 0x32, 0x82, 0xf2, 0x27, 0xd8, 0xd2, 0x87, 0xa3, 0x5c, 0x8c, 0x5d, 0x68, 0xf2, 0xf1, 0x70,
+	0x65, 0x4f, 0xa8, 0x58, 0x32, 0x2d, 0x92, 0x85, 0xd2, 0xa9, 0xc2, 0x48, 0x9e, 0x49, 0x29, 0x33,
+	0x55, 0x12, 0xf0, 0x4b, 0x91, 0xca, 0x3f, 0x14, 0xa1, 0x75, 0x41, 0x83, 0xd0, 0xf1, 0x3d, 0x91,
+	0x53, 0x07, 0x6a, 0xb7, 0x31, 0x20, 0x6a, 0x92, 0x90, 0xac, 0x5e, 0x97, 0x0b, 0xc7, 0x9d, 0x8e,
+	0x9c, 0x59, 0xba, 0xf5, 0x53, 0x80, 0xcd, 0xc6, 0x89, 0x3f, 0x9b, 0x39, 0xd1, 0x7b, 0x3b, 0xbc,
+	0x11, 0x5e, 0x32, 0x08, 0xd3, 0xbe, 0x76, 0x22, 0x11, 0x44, 0xbc, 0xcf, 0x96, 0x80, 0xfc, 0x16,
+	0xea, 0x43, 0xff, 0x7a, 0x48, 0x6f, 0xa9, 0xcb, 0x6e, 0xd0, 0x65, 0x07, 0xe1, 0x3f, 0x26, 0x58,
+	0x06, 0x13, 0xdb, 0x75, 0xc5, 0x4d, 0xd4, 0x89, 0xa0, 0x64, 0x15, 0xea, 0x84, 0x86, 0x73, 0xdf,
+	0x0b, 0x29, 0x7a, 0x06, 0xcd, 0x90, 0xdb, 0xb3, 0x26, 0xfe, 0x94, 0x8a, 0x95, 0x0c, 0x31, 0xd4,
+	0xf3, 0xa7, 0x94, 0x25, 0x37, 0xa3, 0x61, 0x68, 0x5f, 0x27, 0x09, 0x24, 0xa4, 0x1c, 0x42, 0x93,
+	0x0d, 0xff, 0xa4, 0xee, 0x2f, 0xa0, 0xaa, 0x7b, 0x0b, 0x42, 0x3f, 0x89, 0x31, 0xba, 0x9d, 0x99,
+	0x7e, 0xb1, 0x08, 0x11, 0x02, 0xe8, 0x1d, 0x6c, 0x9a, 0x8b, 0x4b, 0x65, 0x12, 0x39, 0xbe, 0x77,
+	0x61, 0xbb, 0xdc, 0x70, 0x3b, 0xbd, 0xee, 0x94, 0xc5, 0x47, 0x11, 0xc9, 0x89, 0xca, 0x67, 0x50,
+	0x39, 0x75, 0xfd, 0xbb, 0x10, 0xfd, 0x0b, 0xe0, 0xca, 0xf5, 0xef, 0xac, 0x89, 0xbf, 0xf0, 0xa2,
+	0x64, 0xb0, 0x31, 0xa4, 0xc7, 0x00, 0xf4, 0x1f, 0xa8, 0x30, 0x82, 0x6d, 0x51, 0xd6, 0x4a, 0xad,
+	0xc3, 0xe4, 0x11, 0xc8, 0xb4, 0x49, 0xcc, 0x93, 0x6b, 0x50, 0x51, 0x67, 0xf3, 0xe8, 0xf3, 0xcb,
+	0x37, 0xd0, 0xce, 0x7b, 0x45, 0x75, 0xd8, 0xf8, 0x5e, 0xd7, 0xb0, 0x54, 0x40, 0x0d, 0xa8, 0x0c,
+	0x55, 0xe5, 0x42, 0x95, 0x8a, 0x08, 0xa0, 0xca, 0xc0, 0x8b, 0x63, 0xa9, 0x74, 0xf4, 0x53, 0x03,
+	0x2a, 0x27, 0x27, 0xa6, 0x33, 0x43, 0xaf, 0xa1, 0x26, 0xfa, 0x01, 0x6d, 0x8a, 0x14, 0xb8, 0xd5,
+	0xbd, 0xc7, 0x82, 0xca, 0x75, 0x8b, 0x5c, 0x40, 0x6f, 0xa0, 0x69, 0xd2, 0x28, 0xbd, 0xbc, 0x2d,
+	0x21, 0x96, 0x00, 0x7b, 0xf7, 0x01, 0xb9, 0x80, 0x9e, 0x43, 0x75, 0x40, 0x23, 0xf6, 0x44, 0xcc,
+	0xbb, 0x48, 0x57, 0x8c, 0x1b, 0xc9, 0x05, 0xf4, 0x0a, 0xc0, 0xf0, 0xef, 0x68, 0xe0, 0x7b, 0xab,
+	0x92, 0x89, 0xd1, 0xe4, 0xe6, 0xe5, 0x02, 0x3a, 0x84, 0xa6, 0x79, 0xb3, 0x88, 0xa6, 0xfe, 0xdd,
+	0xc3, 0xe4, 0xff, 0x0f, 0x0d, 0x42, 0x2f, 0x7d, 0x3f, 0x7a, 0x90, 0xf4, 0x8b, 0x38, 0x64, 0x3c,
+	0x46, 0xab, 0x9d, 0xb0, 0x97, 0x59, 0x8d, 0x72, 0x01, 0xfd, 0x8f, 0x3d, 0x1f, 0x22, 0xbe, 0x42,
+	0xf3, 0x66, 0x9b, 0x4b, 0xb1, 0x30, 0x0e, 0x78, 0x40, 0xa3, 0x74, 0x81, 0xae, 0x0f, 0x21, 0x61,
+	0xcb, 0x05, 0xf4, 0x2d, 0xb4, 0x99, 0x5d, 0x6f, 0x91, 0xaa, 0xac, 0x09, 0x65, 0x8d, 0xde, 0x71,
+	0xa6, 0x30, 0xeb, 0xe3, 0x5f, 0x93, 0xef, 0x11, 0x6c, 0x25, 0x4a, 0x8a, 0xeb, 0xae, 0x49, 0x66,
+	0x8d, 0xce, 0x3b, 0xd8, 0xce, 0x38, 0x0a, 0x75, 0xcf, 0xd0, 0x71, 0xea, 0x6e, 0xb9, 0xc4, 0xd7,
+	0xbb, 0x4b, 0xef, 0xfa, 0xc1, 0x21, 0xbe, 0x81, 0xb6, 0xd0, 0x79, 0x70, 0x84, 0x6f, 0x41, 0x5a,
+	0xba, 0xf9, 0x4b, 0x01, 0x7e, 0x0d, 0x9b, 0x84, 0x86, 0x91, 0x1d, 0x44, 0xf1, 0xfb, 0xf2, 0x61,
+	0x21, 0x1e, 0x43, 0x53, 0x68, 0xf1, 0x67, 0xe7, 0xc3, 0x94, 0x4e, 0x60, 0xc7, 0xe4, 0xf7, 0xcc,
+	0x17, 0x81, 0xe6, 0x4d, 0x9d, 0x89, 0xcd, 0x3e, 0x65, 0xb4, 0xbb, 0x54, 0xcf, 0xee, 0x88, 0x3f,
+	0xb1, 0xe1, 0x46, 0x5f, 0xb4, 0x91, 0xdf, 0x33, 0xeb, 0x6c, 0xbc, 0x82, 0xfa, 0x80, 0x46, 0xf1,
+	0x7c, 0x5a, 0x13, 0x79, 0x52, 0x6c, 0x2e, 0xc0, 0x6b, 0xbb, 0xd5, 0xbb, 0xb1, 0xbd, 0x6b, 0xca,
+	0xc6, 0x68, 0xfc, 0x94, 0x45, 0x42, 0x24, 0x33, 0x58, 0xd7, 0x39, 0x3a, 0x83, 0x27, 0x71, 0x63,
+	0xaf, 0x3e, 0x6b, 0xd7, 0xf8, 0x7d, 0xba, 0x84, 0x56, 0xe4, 0xe5, 0xc2, 0x65, 0x95, 0xff, 0xeb,
+	0x3d, 0xfe, 0x23, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x86, 0x90, 0x8d, 0x54, 0x0f, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/api/bbsim/bbsim.proto b/api/bbsim/bbsim.proto
index 7a67c85..da329f7 100644
--- a/api/bbsim/bbsim.proto
+++ b/api/bbsim/bbsim.proto
@@ -63,6 +63,7 @@
     string EapolState = 10;
     string DhcpState = 11;
     string InternalState = 12;
+    string IGMPState = 13;
 }
 
 message ONUTrafficSchedulers {
diff --git a/api/legacy/bbsim.pb.go b/api/legacy/bbsim.pb.go
index ac41b01..3e94e0e 100644
--- a/api/legacy/bbsim.pb.go
+++ b/api/legacy/bbsim.pb.go
@@ -8,8 +8,8 @@
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
 	_ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options"
-	openolt "github.com/opencord/voltha-protos/v2/go/openolt"
-	tech_profile "github.com/opencord/voltha-protos/v2/go/tech_profile"
+	openolt "github.com/opencord/voltha-protos/v3/go/openolt"
+	tech_profile "github.com/opencord/voltha-protos/v3/go/tech_profile"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"