diff --git a/api/bbsim/bbsim.pb.go b/api/bbsim/bbsim.pb.go
index e33f59c..ce9f1ce 100644
--- a/api/bbsim/bbsim.pb.go
+++ b/api/bbsim/bbsim.pb.go
@@ -862,6 +862,14 @@
 	InternalState        string   `protobuf:"bytes,12,opt,name=InternalState,proto3" json:"InternalState,omitempty"`
 	IGMPState            string   `protobuf:"bytes,13,opt,name=IGMPState,proto3" json:"IGMPState,omitempty"`
 	UniId                uint32   `protobuf:"varint,14,opt,name=UniId,proto3" json:"UniId,omitempty"`
+	UniTagMatch          int32    `protobuf:"varint,15,opt,name=UniTagMatch,proto3" json:"UniTagMatch,omitempty"`
+	UsCTagPriority       uint32   `protobuf:"varint,16,opt,name=UsCTagPriority,proto3" json:"UsCTagPriority,omitempty"`
+	UsSTagPriority       uint32   `protobuf:"varint,17,opt,name=UsSTagPriority,proto3" json:"UsSTagPriority,omitempty"`
+	DsCTagPriority       uint32   `protobuf:"varint,18,opt,name=DsCTagPriority,proto3" json:"DsCTagPriority,omitempty"`
+	DsSTagPriority       uint32   `protobuf:"varint,19,opt,name=DsSTagPriority,proto3" json:"DsSTagPriority,omitempty"`
+	NeedsPPPoE           bool     `protobuf:"varint,20,opt,name=NeedsPPPoE,proto3" json:"NeedsPPPoE,omitempty"`
+	ConfigureMacAddress  bool     `protobuf:"varint,21,opt,name=ConfigureMacAddress,proto3" json:"ConfigureMacAddress,omitempty"`
+	EnableMacLearning    bool     `protobuf:"varint,22,opt,name=EnableMacLearning,proto3" json:"EnableMacLearning,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -990,6 +998,62 @@
 	return 0
 }
 
+func (m *Service) GetUniTagMatch() int32 {
+	if m != nil {
+		return m.UniTagMatch
+	}
+	return 0
+}
+
+func (m *Service) GetUsCTagPriority() uint32 {
+	if m != nil {
+		return m.UsCTagPriority
+	}
+	return 0
+}
+
+func (m *Service) GetUsSTagPriority() uint32 {
+	if m != nil {
+		return m.UsSTagPriority
+	}
+	return 0
+}
+
+func (m *Service) GetDsCTagPriority() uint32 {
+	if m != nil {
+		return m.DsCTagPriority
+	}
+	return 0
+}
+
+func (m *Service) GetDsSTagPriority() uint32 {
+	if m != nil {
+		return m.DsSTagPriority
+	}
+	return 0
+}
+
+func (m *Service) GetNeedsPPPoE() bool {
+	if m != nil {
+		return m.NeedsPPPoE
+	}
+	return false
+}
+
+func (m *Service) GetConfigureMacAddress() bool {
+	if m != nil {
+		return m.ConfigureMacAddress
+	}
+	return false
+}
+
+func (m *Service) GetEnableMacLearning() bool {
+	if m != nil {
+		return m.EnableMacLearning
+	}
+	return false
+}
+
 type ONUTrafficSchedulers struct {
 	TraffSchedulers      *tech_profile.TrafficSchedulers `protobuf:"bytes,1,opt,name=traffSchedulers,proto3" json:"traffSchedulers,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}                        `json:"-"`
@@ -1838,141 +1902,148 @@
 func init() { proto.RegisterFile("api/bbsim/bbsim.proto", fileDescriptor_ef7750073d18011b) }
 
 var fileDescriptor_ef7750073d18011b = []byte{
-	// 2141 bytes of a gzipped FileDescriptorProto
+	// 2256 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xdd, 0x6e, 0xdb, 0xc8,
-	0x15, 0xb6, 0xfe, 0x2c, 0xe9, 0xc8, 0x92, 0xe8, 0xd9, 0xd8, 0x4b, 0x38, 0xde, 0x8d, 0xc1, 0xcd,
-	0x16, 0x4e, 0xd0, 0x75, 0x36, 0x49, 0x77, 0x9b, 0x5c, 0xca, 0x92, 0xac, 0x70, 0x2d, 0x93, 0xc2,
-	0x50, 0x72, 0x90, 0xf6, 0x42, 0xa0, 0xc5, 0xb1, 0x4d, 0x94, 0x22, 0x15, 0x92, 0xb2, 0xeb, 0x07,
-	0x28, 0xfa, 0x08, 0xbd, 0x5c, 0xa0, 0x0f, 0xd0, 0x67, 0xe9, 0x7d, 0x81, 0xf6, 0xaa, 0xef, 0x51,
-	0x9c, 0xe1, 0x90, 0x22, 0x25, 0x39, 0x71, 0xae, 0x7a, 0x23, 0xf0, 0x7c, 0x73, 0xfe, 0xcf, 0x99,
-	0x33, 0x33, 0x82, 0x1d, 0x73, 0x66, 0xbf, 0xb8, 0xb8, 0x08, 0xec, 0x69, 0xf4, 0x7b, 0x34, 0xf3,
-	0xbd, 0xd0, 0x23, 0x25, 0x4e, 0xec, 0x3d, 0xbe, 0xf1, 0x9c, 0xf0, 0xda, 0x1c, 0x73, 0x30, 0x78,
-	0xe1, 0xcd, 0x98, 0xeb, 0x39, 0x61, 0xc4, 0xb3, 0x77, 0x90, 0x5d, 0x0c, 0xd9, 0xe4, 0x1a, 0xbf,
-	0x2f, 0x6d, 0x87, 0x45, 0x1c, 0xca, 0x7f, 0xf2, 0x50, 0x1e, 0xe8, 0xda, 0xc0, 0xf3, 0x43, 0xd2,
-	0x80, 0xbc, 0xda, 0x91, 0x73, 0x07, 0xb9, 0xc3, 0x12, 0xcd, 0xab, 0x1d, 0xb2, 0x0f, 0x55, 0x7d,
-	0xc6, 0x7c, 0x23, 0x34, 0x43, 0x26, 0xe7, 0x0f, 0x72, 0x87, 0x55, 0xba, 0x00, 0xc8, 0x53, 0xa8,
-	0xab, 0x6e, 0xc8, 0x7c, 0xd7, 0x74, 0x22, 0x8e, 0x02, 0xe7, 0xc8, 0x82, 0xe4, 0x00, 0x6a, 0x03,
-	0x73, 0xf2, 0x27, 0x16, 0xb6, 0xbd, 0xb9, 0x1b, 0xca, 0xc5, 0x83, 0xdc, 0x61, 0x91, 0xa6, 0x21,
-	0x72, 0x02, 0xcd, 0x96, 0xe3, 0x78, 0x13, 0x33, 0x64, 0x96, 0xee, 0xce, 0x55, 0x2b, 0x90, 0x4b,
-	0x07, 0x85, 0xc3, 0xda, 0xab, 0xfd, 0xa3, 0x28, 0xdc, 0x81, 0xe7, 0x26, 0x0c, 0x94, 0x05, 0xde,
-	0xdc, 0x9f, 0xb0, 0x80, 0x2e, 0x0b, 0x91, 0x5f, 0x60, 0x3b, 0x81, 0x7a, 0x6c, 0x8a, 0x11, 0x05,
-	0xf2, 0xe6, 0x03, 0x34, 0xad, 0x8a, 0x65, 0x74, 0xf1, 0x0f, 0xf4, 0xaa, 0xfc, 0x45, 0xba, 0x62,
-	0x31, 0xe5, 0x14, 0x76, 0xd6, 0xf2, 0x12, 0x05, 0xb6, 0x0c, 0xe6, 0xdb, 0xa6, 0xa3, 0xcd, 0xa7,
-	0x17, 0xcc, 0xe7, 0x89, 0xaf, 0xd2, 0x0c, 0xc6, 0x4b, 0x62, 0xf1, 0xdc, 0x63, 0x49, 0x2c, 0xe5,
-	0xf7, 0x50, 0xd6, 0x34, 0xf5, 0xcb, 0xab, 0xa5, 0xfc, 0x37, 0x07, 0x05, 0xdd, 0x59, 0x95, 0x5a,
-	0x76, 0x22, 0xbf, 0xc6, 0x89, 0x8c, 0xe6, 0xc2, 0x67, 0xfb, 0xa0, 0xb8, 0xae, 0x0f, 0xd0, 0xee,
-	0x40, 0x2e, 0xf3, 0xa5, 0xbc, 0x3a, 0x20, 0xcf, 0xa1, 0x22, 0x02, 0x89, 0xcb, 0xdd, 0x10, 0x89,
-	0x15, 0x30, 0x4d, 0xd6, 0x91, 0x57, 0xb4, 0x68, 0x5c, 0xd0, 0x98, 0x57, 0xc0, 0x34, 0x59, 0x57,
-	0xfe, 0x92, 0x03, 0x59, 0x77, 0xc2, 0x95, 0x74, 0x0f, 0xef, 0x66, 0x8c, 0xbc, 0x81, 0x62, 0x78,
-	0x37, 0x63, 0x3c, 0xfc, 0xc6, 0xab, 0xa7, 0x42, 0xc9, 0x7d, 0xec, 0x47, 0xf8, 0x43, 0xb9, 0x84,
-	0xf2, 0x02, 0x8a, 0x5c, 0x43, 0x0d, 0xca, 0x23, 0xed, 0x54, 0xd3, 0xdf, 0x6b, 0xd2, 0x06, 0xd9,
-	0x82, 0x4a, 0xab, 0xdf, 0xd7, 0xdb, 0x63, 0xb5, 0x23, 0xe5, 0x90, 0xea, 0x75, 0xcf, 0xc6, 0x03,
-	0x9d, 0x0e, 0xa5, 0xbc, 0xf2, 0x8f, 0x1c, 0x3c, 0x5a, 0xa7, 0x98, 0x90, 0x48, 0x93, 0xa8, 0x76,
-	0xa4, 0x75, 0x1f, 0xaa, 0x03, 0xcf, 0xc5, 0x00, 0x44, 0xb1, 0xeb, 0x74, 0x01, 0x90, 0x47, 0x50,
-	0xe2, 0x2d, 0xce, 0x53, 0x5f, 0xa7, 0x11, 0x41, 0x76, 0x61, 0x13, 0xd7, 0x35, 0x8f, 0xe7, 0xbb,
-	0x4e, 0x05, 0x45, 0xbe, 0x05, 0x88, 0x6d, 0xa9, 0x96, 0x5c, 0xe2, 0x85, 0x4e, 0x21, 0x28, 0x77,
-	0xe2, 0x78, 0xb7, 0xaa, 0x25, 0x6f, 0xf2, 0xbd, 0x28, 0x28, 0x85, 0xc2, 0xce, 0x3a, 0x7f, 0x03,
-	0xf2, 0x16, 0xaa, 0x7e, 0x4c, 0xc8, 0x39, 0x9e, 0xfe, 0xc7, 0x9f, 0xc8, 0x1c, 0x5d, 0x70, 0x2b,
-	0xbf, 0x16, 0xa1, 0xa0, 0x6b, 0xa3, 0xff, 0x5b, 0xd3, 0xa5, 0xf2, 0xda, 0x11, 0xa9, 0x58, 0x00,
-	0xe4, 0x00, 0xaa, 0xef, 0x6e, 0x5b, 0x96, 0xe5, 0xb3, 0x20, 0x90, 0x2b, 0x28, 0x7f, 0x9c, 0x97,
-	0x73, 0x74, 0x01, 0x92, 0xbd, 0x24, 0xc7, 0x55, 0x14, 0xe6, 0xcb, 0x71, 0x9e, 0x8f, 0xa0, 0x12,
-	0x30, 0xff, 0xc6, 0xc6, 0xac, 0x40, 0xa6, 0x29, 0x8d, 0x08, 0xe6, 0xdc, 0x09, 0x0f, 0xe9, 0xc0,
-	0x37, 0xea, 0xd4, 0xbc, 0x62, 0x86, 0x77, 0x19, 0xde, 0x9a, 0x3e, 0xeb, 0xfe, 0x79, 0xc6, 0x26,
-	0x21, 0xb3, 0x0c, 0x36, 0x09, 0x6d, 0xcf, 0x0d, 0xe4, 0x1a, 0xf7, 0xef, 0xd3, 0x4c, 0x2b, 0x5a,
-	0x28, 0x9b, 0x30, 0xfb, 0x26, 0xa5, 0x65, 0x6b, 0x8d, 0x96, 0x65, 0x26, 0xf2, 0x23, 0x7c, 0xd5,
-	0x9a, 0x84, 0xf6, 0x0d, 0xe3, 0x6c, 0x5d, 0x37, 0xb4, 0xc3, 0x3b, 0xd5, 0x92, 0xeb, 0x5c, 0x76,
-	0xdd, 0x12, 0xf9, 0x19, 0x76, 0xdb, 0xde, 0x74, 0x6a, 0x87, 0x21, 0xb3, 0xb2, 0x42, 0x0d, 0x2e,
-	0x74, 0xcf, 0x2a, 0xf9, 0x16, 0x8a, 0x73, 0xd7, 0x0e, 0xe4, 0x26, 0xcf, 0x10, 0x88, 0x0c, 0x8d,
-	0x34, 0x95, 0x72, 0x5c, 0xf9, 0x57, 0x0e, 0x0a, 0x23, 0x4d, 0x5d, 0xe9, 0x10, 0xd1, 0xf3, 0x1d,
-	0x31, 0xfa, 0x22, 0x42, 0xa0, 0x86, 0x2b, 0xfa, 0x21, 0x22, 0x70, 0x47, 0x9d, 0x31, 0xb5, 0x23,
-	0xf6, 0x01, 0xff, 0xce, 0x76, 0x4f, 0x69, 0xb9, 0x7b, 0x16, 0x7b, 0x67, 0x93, 0xab, 0x8f, 0x6b,
-	0xfa, 0x3c, 0x55, 0xd3, 0xf2, 0xba, 0x9a, 0xa6, 0xea, 0xa9, 0x88, 0x7d, 0x5c, 0xe1, 0xb3, 0x24,
-	0xe6, 0x1b, 0xb9, 0x76, 0x34, 0x35, 0xf0, 0x57, 0xf9, 0x6b, 0x01, 0xca, 0x42, 0x12, 0xbd, 0xd4,
-	0xcc, 0x69, 0xb2, 0xef, 0xf1, 0x1b, 0xbd, 0x5c, 0x74, 0xa0, 0x18, 0xd9, 0x8b, 0xee, 0xbb, 0x37,
-	0x5a, 0x63, 0x68, 0x5e, 0xf1, 0x68, 0x4b, 0x94, 0x7f, 0x23, 0xd6, 0x46, 0x2c, 0x6a, 0x71, 0xfe,
-	0x8d, 0x73, 0x40, 0x63, 0xcc, 0x0a, 0xba, 0xe6, 0xcc, 0x73, 0x78, 0x9c, 0x15, 0x9a, 0x42, 0xd0,
-	0x36, 0xa7, 0x3a, 0xd7, 0x93, 0x19, 0x9f, 0xcb, 0x15, 0xba, 0x00, 0x92, 0x55, 0xf5, 0x6a, 0x3a,
-	0xe3, 0x21, 0xc6, 0xab, 0x08, 0x10, 0x19, 0xca, 0xe2, 0xa8, 0x8c, 0x36, 0x06, 0x8d, 0x49, 0xb4,
-	0xca, 0xd5, 0x47, 0x89, 0x07, 0xee, 0x78, 0x0a, 0x41, 0xbd, 0xa8, 0x3f, 0x5a, 0xae, 0x45, 0x11,
-	0x27, 0xc0, 0xea, 0xae, 0xde, 0xba, 0x67, 0x57, 0xab, 0xbd, 0xb3, 0x41, 0xc4, 0x51, 0x8f, 0x74,
-	0x24, 0x00, 0x66, 0x6d, 0xe4, 0xda, 0xa2, 0x31, 0xeb, 0x34, 0x22, 0x14, 0x13, 0x1e, 0xe9, 0xda,
-	0x68, 0xe8, 0x9b, 0x97, 0x97, 0xf6, 0xc4, 0x98, 0x5c, 0x33, 0x6b, 0xee, 0x30, 0x3f, 0x20, 0x2a,
-	0x34, 0x43, 0x04, 0x17, 0x10, 0x2f, 0x50, 0xed, 0xd5, 0x93, 0xa3, 0xcc, 0x65, 0x69, 0x45, 0x92,
-	0x2e, 0xcb, 0x29, 0x87, 0x50, 0xd4, 0xb5, 0x51, 0x40, 0x0e, 0xa0, 0x64, 0x87, 0x6c, 0x1a, 0xcf,
-	0xca, 0xb8, 0xe7, 0x75, 0x6d, 0x44, 0xa3, 0x05, 0xe5, 0x47, 0xa8, 0x18, 0x71, 0x1b, 0x3d, 0xcd,
-	0x72, 0x2f, 0xf7, 0x9b, 0x90, 0x38, 0x84, 0xe2, 0x48, 0x53, 0xef, 0xd5, 0x8d, 0xfb, 0x29, 0xd1,
-	0x0d, 0x68, 0x89, 0x7d, 0x9c, 0xb3, 0x20, 0x7c, 0xc8, 0x15, 0x43, 0x79, 0x0e, 0x30, 0xd0, 0xb5,
-	0x58, 0x22, 0x73, 0x14, 0xe5, 0x96, 0x8e, 0x22, 0xa5, 0x0f, 0x80, 0xb6, 0x04, 0xef, 0x21, 0x34,
-	0xb1, 0x27, 0x57, 0x0d, 0x2c, 0xc3, 0x71, 0x51, 0x3a, 0xa2, 0xc9, 0x23, 0x42, 0xf9, 0x77, 0x01,
-	0xaa, 0x2d, 0xc7, 0xf4, 0xa7, 0x7c, 0xb3, 0xfc, 0xb3, 0x00, 0x25, 0xfc, 0x08, 0x48, 0x19, 0x0a,
-	0x7d, 0xdd, 0x90, 0x36, 0x48, 0x03, 0xa0, 0xf3, 0x41, 0xd5, 0x7a, 0xe3, 0x5e, 0xcb, 0x18, 0x48,
-	0x39, 0x52, 0x87, 0xaa, 0xae, 0x8d, 0xc6, 0xad, 0x7e, 0x8b, 0x9e, 0x49, 0x79, 0xf2, 0x35, 0x7c,
-	0x85, 0xa4, 0x31, 0x6c, 0xd1, 0xe1, 0x68, 0x30, 0x3e, 0x69, 0xa9, 0xfd, 0x11, 0xed, 0x4a, 0x05,
-	0xb2, 0x0b, 0x84, 0x2f, 0xa8, 0x3d, 0xad, 0xd5, 0x1f, 0x77, 0xba, 0x3d, 0xda, 0xea, 0x74, 0xa5,
-	0x62, 0x2c, 0xd0, 0xa1, 0xea, 0xc9, 0x70, 0xac, 0x9f, 0x8c, 0xdf, 0xab, 0x5a, 0x47, 0x7f, 0x2f,
-	0x95, 0xc8, 0x3e, 0xc8, 0xb8, 0xd0, 0xd7, 0x0d, 0x03, 0x71, 0xfd, 0xac, 0xad, 0x8e, 0xdb, 0xef,
-	0x5a, 0x9a, 0xd6, 0xed, 0x4b, 0x9b, 0x89, 0x1d, 0xae, 0xce, 0x48, 0xec, 0x94, 0xc9, 0x33, 0xf8,
-	0x1e, 0x17, 0x86, 0xb4, 0xa5, 0x19, 0x67, 0xaa, 0x61, 0xa8, 0xba, 0x36, 0x56, 0xb5, 0x61, 0x97,
-	0x9e, 0x74, 0x69, 0x57, 0x6b, 0x77, 0xc7, 0xef, 0x5b, 0x54, 0x53, 0xb5, 0x9e, 0x54, 0x21, 0x7b,
-	0xb0, 0xcb, 0x5d, 0x6f, 0x0f, 0xd5, 0xf3, 0xd6, 0x10, 0x19, 0x63, 0x35, 0x55, 0x22, 0xf3, 0xe6,
-	0x1c, 0x0f, 0xa8, 0xde, 0xee, 0x1a, 0x06, 0xc6, 0xdb, 0xa5, 0x54, 0xa7, 0x12, 0x90, 0x03, 0xd8,
-	0x4f, 0xfb, 0x75, 0xda, 0xfd, 0x30, 0x36, 0x3e, 0x68, 0xed, 0x44, 0xb6, 0x46, 0x76, 0x60, 0x1b,
-	0x39, 0xd4, 0xe1, 0x68, 0x3c, 0xd0, 0x35, 0xcc, 0xc5, 0xd0, 0x90, 0xb6, 0xc8, 0x36, 0xd4, 0x93,
-	0x4c, 0xa1, 0xb8, 0x54, 0x5f, 0x86, 0x8e, 0xa5, 0x46, 0x1c, 0x58, 0x0c, 0x0d, 0xda, 0x63, 0x8c,
-	0x42, 0x6a, 0xc6, 0xf9, 0xc8, 0x2c, 0xb4, 0x85, 0x57, 0x12, 0x21, 0xd0, 0x48, 0xaf, 0x9e, 0xa8,
-	0xd2, 0x36, 0xf9, 0x0a, 0x9a, 0x69, 0xac, 0x75, 0xa6, 0x4a, 0x44, 0x79, 0x03, 0x0d, 0x5e, 0xdf,
-	0x81, 0xe9, 0x9b, 0x53, 0x16, 0x32, 0x9f, 0x48, 0x50, 0x38, 0x65, 0x77, 0xa2, 0x4d, 0xf0, 0x13,
-	0x5b, 0xe3, 0xdc, 0x74, 0xe6, 0xf1, 0x95, 0x35, 0x22, 0x94, 0xbf, 0xe7, 0xb8, 0x3e, 0x2e, 0x9d,
-	0x6a, 0xcd, 0xa4, 0x5b, 0x84, 0x86, 0x05, 0xf0, 0xa0, 0x3b, 0xc5, 0x2e, 0x6c, 0xe2, 0x90, 0x98,
-	0x07, 0x62, 0xa4, 0x0a, 0x8a, 0xfc, 0x04, 0x90, 0xb8, 0x18, 0xc8, 0x45, 0xbe, 0xb7, 0x76, 0xc4,
-	0xde, 0xca, 0x06, 0x40, 0x53, 0x8c, 0xca, 0x47, 0x68, 0xea, 0xfd, 0x61, 0xc6, 0xc7, 0x03, 0xa8,
-	0xf1, 0x61, 0x75, 0x69, 0x4e, 0x98, 0x38, 0xd0, 0xea, 0x34, 0x0d, 0x25, 0x33, 0x0e, 0x49, 0x1e,
-	0x49, 0x3e, 0x35, 0xe3, 0x62, 0xf0, 0x3e, 0x4f, 0xf1, 0x7a, 0x5b, 0x3f, 0x67, 0x7e, 0x60, 0x7b,
-	0xae, 0x88, 0x49, 0x86, 0xf2, 0x4d, 0x04, 0x88, 0x9c, 0xc4, 0x24, 0xe6, 0xeb, 0x62, 0x6e, 0x3b,
-	0xd6, 0xd0, 0x9e, 0x26, 0x0f, 0x82, 0x04, 0xc0, 0x49, 0x3d, 0xe1, 0x67, 0xf6, 0x3b, 0x33, 0xb8,
-	0x16, 0x56, 0x52, 0x08, 0x4a, 0x5f, 0xd9, 0xa1, 0x70, 0x22, 0xba, 0x5d, 0x2d, 0x00, 0xe5, 0x0d,
-	0x54, 0xfa, 0xde, 0x55, 0x9f, 0xdd, 0x30, 0x07, 0x2b, 0xe8, 0xe0, 0x87, 0xb0, 0x1f, 0x11, 0x18,
-	0xc1, 0xc4, 0x74, 0x1c, 0x51, 0x89, 0x0a, 0x15, 0x94, 0xd2, 0x85, 0x0a, 0x65, 0xc1, 0xcc, 0x73,
-	0x03, 0x46, 0x9e, 0x40, 0x2d, 0xe0, 0xfa, 0xc6, 0x13, 0xcf, 0x62, 0xe2, 0xf8, 0x87, 0x08, 0x6a,
-	0x7b, 0x16, 0xc3, 0xe0, 0xa6, 0x2c, 0x08, 0xcc, 0xab, 0x38, 0x80, 0x98, 0x54, 0xfe, 0x96, 0x83,
-	0x1a, 0x9e, 0x45, 0x71, 0xe2, 0x9f, 0xc1, 0xa6, 0xee, 0xce, 0x29, 0xfb, 0x28, 0xe6, 0xf7, 0x76,
-	0x6a, 0xec, 0x46, 0x2c, 0x54, 0x30, 0x90, 0xb7, 0xb0, 0x65, 0xcc, 0x2f, 0x5a, 0xfc, 0x2e, 0x74,
-	0x6e, 0x3a, 0x5c, 0x73, 0x23, 0xa9, 0x77, 0xb2, 0xc4, 0x67, 0x11, 0xcd, 0xb0, 0x62, 0x93, 0xf5,
-	0x7c, 0x6f, 0x3e, 0x8b, 0xcf, 0xec, 0x28, 0x6d, 0x19, 0x4c, 0x39, 0x85, 0x12, 0x5e, 0xa9, 0x03,
-	0xf2, 0x0d, 0xc0, 0xa5, 0xe3, 0xdd, 0x8e, 0x27, 0xfc, 0xe5, 0x2b, 0x66, 0x29, 0x22, 0xd1, 0xbb,
-	0xf7, 0x3b, 0x28, 0x21, 0x81, 0x07, 0x3f, 0xf6, 0x5b, 0xfd, 0x28, 0x7e, 0xba, 0xa3, 0x34, 0x8d,
-	0xd6, 0x94, 0x27, 0x50, 0xc6, 0x6a, 0x79, 0xf3, 0x10, 0xd3, 0x6c, 0x31, 0xc7, 0xbc, 0x13, 0x9a,
-	0x22, 0x42, 0x29, 0x43, 0xa9, 0x3b, 0x9d, 0x85, 0x77, 0xcf, 0xf7, 0xa1, 0x2c, 0x2e, 0x1f, 0x38,
-	0x3f, 0xbb, 0xc3, 0x77, 0xd2, 0x06, 0xa9, 0x40, 0x71, 0xa0, 0x0f, 0x0d, 0x29, 0xf7, 0xfc, 0x25,
-	0x34, 0xb2, 0x81, 0xe1, 0xda, 0x2f, 0xba, 0x8a, 0xcf, 0x98, 0x2a, 0x94, 0xfa, 0xdd, 0xd6, 0x79,
-	0x57, 0xca, 0x11, 0x80, 0x4d, 0x04, 0xcf, 0x5f, 0x4b, 0xf9, 0x57, 0xbf, 0x6e, 0x41, 0xe9, 0xf8,
-	0xd8, 0xb0, 0xa7, 0xe4, 0x05, 0x94, 0x45, 0xcf, 0x91, 0x2d, 0x91, 0x25, 0x6e, 0x73, 0xef, 0x91,
-	0xa0, 0x32, 0x1d, 0xa9, 0x6c, 0x90, 0x97, 0x50, 0x33, 0x58, 0x98, 0x34, 0x48, 0x53, 0xb0, 0xc5,
-	0xc0, 0xde, 0x32, 0xa0, 0x6c, 0x90, 0xa7, 0xb0, 0xd9, 0x63, 0x21, 0xbe, 0x50, 0xb3, 0x26, 0x60,
-	0xf1, 0xd4, 0x50, 0x36, 0xc8, 0x1f, 0x41, 0x8e, 0xb8, 0xd6, 0xbc, 0x53, 0x9e, 0x7c, 0xe6, 0x39,
-	0xb7, 0xb7, 0xff, 0x09, 0x86, 0x40, 0xd9, 0x20, 0x3f, 0x00, 0x0c, 0xbc, 0x5b, 0xe6, 0x7b, 0xee,
-	0xaa, 0x1b, 0xb1, 0xc7, 0x71, 0xeb, 0x2a, 0x1b, 0xe4, 0x08, 0x6a, 0xc6, 0xf5, 0x3c, 0xb4, 0xbc,
-	0xdb, 0x87, 0xf1, 0xff, 0x16, 0xaa, 0x94, 0x5d, 0x78, 0x5e, 0xf8, 0x20, 0x6e, 0x2c, 0x58, 0xe8,
-	0xcd, 0xae, 0xe8, 0xa0, 0x8d, 0x77, 0x01, 0xe6, 0x7f, 0x5e, 0xe4, 0x15, 0x34, 0x8d, 0xd0, 0xf4,
-	0xc3, 0x2f, 0x91, 0xf9, 0x19, 0xb6, 0x29, 0x0b, 0x96, 0xa4, 0xe2, 0x4b, 0x88, 0xe8, 0xbc, 0x75,
-	0x72, 0xcf, 0xa2, 0x72, 0x69, 0x23, 0xb2, 0xba, 0xd1, 0xf6, 0x52, 0x57, 0x1e, 0x65, 0x83, 0xfc,
-	0x06, 0x2f, 0x8b, 0x21, 0xbf, 0x1a, 0x65, 0xdd, 0xa9, 0x2d, 0xd8, 0x30, 0xfd, 0xaf, 0xa1, 0xd6,
-	0x63, 0x61, 0x72, 0x31, 0xda, 0x4e, 0xdd, 0x6d, 0x84, 0xde, 0x66, 0xf6, 0x72, 0x14, 0xf0, 0x22,
-	0x00, 0x2a, 0x77, 0xe7, 0x23, 0xd7, 0x0e, 0xd6, 0xf9, 0x52, 0x5b, 0xa8, 0x11, 0x46, 0x92, 0xa2,
-	0xad, 0x77, 0xfe, 0x9e, 0xc4, 0x0a, 0xa1, 0x96, 0xe3, 0xac, 0x89, 0x64, 0x8d, 0xcc, 0x5b, 0xd8,
-	0x4e, 0x19, 0x0a, 0x74, 0x77, 0xa0, 0x6b, 0x89, 0xb9, 0xc5, 0x7d, 0x6b, 0xbd, 0xb9, 0xa4, 0x0f,
-	0x1f, 0xec, 0xe2, 0x4b, 0x68, 0x08, 0x99, 0x07, 0x7b, 0xf8, 0x06, 0xa4, 0x85, 0x99, 0x2f, 0x72,
-	0xf0, 0x77, 0xb0, 0x25, 0x9a, 0x26, 0x7a, 0x4a, 0x7c, 0xa2, 0x54, 0x29, 0xa9, 0xd7, 0x50, 0x13,
-	0x52, 0xfc, 0x85, 0xf1, 0x30, 0xa1, 0x63, 0xd8, 0x31, 0x78, 0x7d, 0xf9, 0x29, 0xab, 0xba, 0x96,
-	0x3d, 0x31, 0x71, 0x86, 0x91, 0xdd, 0x45, 0x5a, 0xd2, 0x07, 0xf0, 0x27, 0x74, 0xe0, 0xae, 0xbf,
-	0x47, 0x47, 0xf6, 0x10, 0x5f, 0xa7, 0xe3, 0x07, 0xa8, 0xf4, 0x58, 0x18, 0xcd, 0xf5, 0x35, 0x15,
-	0x89, 0x93, 0xcd, 0x19, 0x78, 0x6e, 0x9b, 0xed, 0x6b, 0xd3, 0xbd, 0x62, 0x78, 0x44, 0x45, 0xef,
-	0x12, 0x22, 0x58, 0x52, 0x87, 0xd6, 0x3a, 0x43, 0xa7, 0xf0, 0x75, 0xd4, 0xd0, 0xab, 0x6f, 0x95,
-	0x35, 0x76, 0x1f, 0x2f, 0xa0, 0x15, 0xfe, 0x64, 0xeb, 0xf1, 0xad, 0xb1, 0x7e, 0xeb, 0x89, 0x5d,
-	0xf1, 0x13, 0xde, 0x49, 0x6e, 0x4c, 0xc7, 0xb6, 0xcc, 0x90, 0x9d, 0x59, 0xc1, 0xc3, 0x9a, 0xee,
-	0xf8, 0xfb, 0x3f, 0x7c, 0x77, 0x65, 0x87, 0xd7, 0xf3, 0x8b, 0xa3, 0x89, 0x37, 0xe5, 0xff, 0x3c,
-	0x4f, 0x3c, 0xdf, 0x12, 0x7f, 0x55, 0x27, 0x7f, 0x5a, 0x5f, 0x6c, 0xf2, 0x7f, 0x9a, 0x5f, 0xff,
-	0x2f, 0x00, 0x00, 0xff, 0xff, 0x55, 0x04, 0x3c, 0x13, 0xc8, 0x16, 0x00, 0x00,
+	0x15, 0xb6, 0xfe, 0x2c, 0xe9, 0xc8, 0x92, 0xe8, 0x49, 0xec, 0x25, 0x1c, 0xef, 0xc6, 0xe0, 0x66,
+	0x17, 0x4e, 0xb0, 0xeb, 0x6c, 0x92, 0xee, 0x36, 0xb9, 0x94, 0x25, 0x5a, 0xe1, 0x5a, 0x26, 0x89,
+	0xa1, 0xe4, 0x20, 0xed, 0x85, 0x40, 0x8b, 0x63, 0x99, 0x28, 0x45, 0x2a, 0x24, 0x65, 0xd7, 0x0f,
+	0xd0, 0x67, 0xe8, 0xe5, 0x02, 0x7d, 0x80, 0xbe, 0x47, 0xef, 0x7a, 0x5f, 0xa0, 0xbd, 0xea, 0x7b,
+	0x14, 0x33, 0x1c, 0x52, 0xa4, 0x44, 0x3b, 0xce, 0x55, 0x6f, 0x04, 0x9e, 0xef, 0xfc, 0xcc, 0x99,
+	0xf3, 0x33, 0x73, 0x46, 0xb0, 0x63, 0xce, 0xed, 0x97, 0x17, 0x17, 0x81, 0x3d, 0x8b, 0x7e, 0x8f,
+	0xe6, 0xbe, 0x17, 0x7a, 0xa8, 0xc2, 0x88, 0xbd, 0x27, 0xd7, 0x9e, 0x13, 0x5e, 0x99, 0x63, 0x06,
+	0x06, 0x2f, 0xbd, 0x39, 0x71, 0x3d, 0x27, 0x8c, 0x64, 0xf6, 0x0e, 0xb2, 0xcc, 0x90, 0x4c, 0xae,
+	0xe8, 0xf7, 0xa5, 0xed, 0x90, 0x48, 0x42, 0xfa, 0x4f, 0x11, 0xaa, 0xba, 0xa6, 0xea, 0x9e, 0x1f,
+	0xa2, 0x16, 0x14, 0x95, 0x9e, 0x58, 0x38, 0x28, 0x1c, 0x56, 0x70, 0x51, 0xe9, 0xa1, 0x7d, 0xa8,
+	0x6b, 0x73, 0xe2, 0x1b, 0xa1, 0x19, 0x12, 0xb1, 0x78, 0x50, 0x38, 0xac, 0xe3, 0x25, 0x80, 0x9e,
+	0x41, 0x53, 0x71, 0x43, 0xe2, 0xbb, 0xa6, 0x13, 0x49, 0x94, 0x98, 0x44, 0x16, 0x44, 0x07, 0xd0,
+	0xd0, 0xcd, 0xc9, 0x9f, 0x48, 0xd8, 0xf5, 0x16, 0x6e, 0x28, 0x96, 0x0f, 0x0a, 0x87, 0x65, 0x9c,
+	0x86, 0xd0, 0x09, 0xb4, 0x3b, 0x8e, 0xe3, 0x4d, 0xcc, 0x90, 0x58, 0x9a, 0xbb, 0x50, 0xac, 0x40,
+	0xac, 0x1c, 0x94, 0x0e, 0x1b, 0xaf, 0xf7, 0x8f, 0xa2, 0xed, 0xea, 0x9e, 0x9b, 0x08, 0x60, 0x12,
+	0x78, 0x0b, 0x7f, 0x42, 0x02, 0xbc, 0xaa, 0x84, 0x7e, 0x85, 0xed, 0x04, 0xea, 0x93, 0x19, 0xdd,
+	0x51, 0x20, 0x6e, 0x3e, 0xc0, 0xd2, 0xba, 0x5a, 0xc6, 0x16, 0xfb, 0xa0, 0x5e, 0x55, 0xbf, 0xc8,
+	0x56, 0xac, 0x26, 0x9d, 0xc2, 0x4e, 0xae, 0x2c, 0x92, 0x60, 0xcb, 0x20, 0xbe, 0x6d, 0x3a, 0xea,
+	0x62, 0x76, 0x41, 0x7c, 0x16, 0xf8, 0x3a, 0xce, 0x60, 0x2c, 0x25, 0x16, 0x8b, 0x3d, 0x4d, 0x89,
+	0x25, 0xfd, 0x1e, 0xaa, 0xaa, 0xaa, 0x7c, 0x79, 0xb6, 0xa4, 0xff, 0x16, 0xa0, 0xa4, 0x39, 0xeb,
+	0x5a, 0xab, 0x4e, 0x14, 0x73, 0x9c, 0xc8, 0x58, 0x2e, 0x7d, 0xb6, 0x0e, 0xca, 0x79, 0x75, 0x40,
+	0xd7, 0xd5, 0xc5, 0x2a, 0x63, 0x15, 0x15, 0x1d, 0xbd, 0x80, 0x1a, 0xdf, 0x48, 0x9c, 0xee, 0x16,
+	0x0f, 0x2c, 0x87, 0x71, 0xc2, 0xa7, 0xb2, 0xbc, 0x44, 0xe3, 0x84, 0xc6, 0xb2, 0x1c, 0xc6, 0x09,
+	0x5f, 0xfa, 0x4b, 0x01, 0x44, 0xcd, 0x09, 0xd7, 0xc2, 0x3d, 0xbc, 0x9d, 0x13, 0xf4, 0x16, 0xca,
+	0xe1, 0xed, 0x9c, 0xb0, 0xed, 0xb7, 0x5e, 0x3f, 0xe3, 0x46, 0xee, 0x12, 0x3f, 0xa2, 0x3f, 0x98,
+	0x69, 0x48, 0x2f, 0xa1, 0xcc, 0x2c, 0x34, 0xa0, 0x3a, 0x52, 0x4f, 0x55, 0xed, 0x83, 0x2a, 0x6c,
+	0xa0, 0x2d, 0xa8, 0x75, 0x06, 0x03, 0xad, 0x3b, 0x56, 0x7a, 0x42, 0x81, 0x52, 0x7d, 0xf9, 0x6c,
+	0xac, 0x6b, 0x78, 0x28, 0x14, 0xa5, 0xbf, 0x17, 0xe0, 0x71, 0x9e, 0x61, 0x84, 0x22, 0x4b, 0x3c,
+	0xdb, 0x91, 0xd5, 0x7d, 0xa8, 0xeb, 0x9e, 0x4b, 0x37, 0xc0, 0x93, 0xdd, 0xc4, 0x4b, 0x00, 0x3d,
+	0x86, 0x0a, 0x2b, 0x71, 0x16, 0xfa, 0x26, 0x8e, 0x08, 0xb4, 0x0b, 0x9b, 0x94, 0xaf, 0x7a, 0x2c,
+	0xde, 0x4d, 0xcc, 0x29, 0xf4, 0x0d, 0x40, 0xbc, 0x96, 0x62, 0x89, 0x15, 0x96, 0xe8, 0x14, 0x42,
+	0xf5, 0x4e, 0x1c, 0xef, 0x46, 0xb1, 0xc4, 0x4d, 0xd6, 0x8b, 0x9c, 0x92, 0x30, 0xec, 0xe4, 0xf9,
+	0x1b, 0xa0, 0x77, 0x50, 0xf7, 0x63, 0x42, 0x2c, 0xb0, 0xf0, 0x3f, 0xb9, 0x27, 0x72, 0x78, 0x29,
+	0x2d, 0xfd, 0x56, 0x86, 0x92, 0xa6, 0x8e, 0xfe, 0x6f, 0x45, 0x97, 0x8a, 0x6b, 0x8f, 0x87, 0x62,
+	0x09, 0xa0, 0x03, 0xa8, 0xbf, 0xbf, 0xe9, 0x58, 0x96, 0x4f, 0x82, 0x40, 0xac, 0x51, 0xfd, 0xe3,
+	0xa2, 0x58, 0xc0, 0x4b, 0x10, 0xed, 0x25, 0x31, 0xae, 0x53, 0x65, 0xc6, 0x8e, 0xe3, 0x7c, 0x04,
+	0xb5, 0x80, 0xf8, 0xd7, 0x36, 0x8d, 0x0a, 0x64, 0x8a, 0xd2, 0x88, 0x60, 0x26, 0x9d, 0xc8, 0xa0,
+	0x1e, 0x7c, 0xad, 0xcc, 0xcc, 0x29, 0x31, 0xbc, 0xcb, 0xf0, 0xc6, 0xf4, 0x89, 0xfc, 0xe7, 0x39,
+	0x99, 0x84, 0xc4, 0x32, 0xc8, 0x24, 0xb4, 0x3d, 0x37, 0x10, 0x1b, 0xcc, 0xbf, 0xfb, 0x85, 0xd6,
+	0xac, 0x60, 0x32, 0x21, 0xf6, 0x75, 0xca, 0xca, 0x56, 0x8e, 0x95, 0x55, 0x21, 0xf4, 0x13, 0x3c,
+	0xea, 0x4c, 0x42, 0xfb, 0x9a, 0x30, 0x31, 0xd9, 0x0d, 0xed, 0xf0, 0x56, 0xb1, 0xc4, 0x26, 0xd3,
+	0xcd, 0x63, 0xa1, 0x5f, 0x60, 0xb7, 0xeb, 0xcd, 0x66, 0x76, 0x18, 0x12, 0x2b, 0xab, 0xd4, 0x62,
+	0x4a, 0x77, 0x70, 0xd1, 0x37, 0x50, 0x5e, 0xb8, 0x76, 0x20, 0xb6, 0x59, 0x84, 0x80, 0x47, 0x68,
+	0xa4, 0x2a, 0x98, 0xe1, 0xd2, 0xbf, 0x0a, 0x50, 0x1a, 0xa9, 0xca, 0x5a, 0x85, 0xf0, 0x9a, 0xef,
+	0xf1, 0xa3, 0x2f, 0x22, 0x38, 0x6a, 0xb8, 0xbc, 0x1e, 0x22, 0x82, 0x76, 0xd4, 0x19, 0x51, 0x7a,
+	0xbc, 0x0f, 0xd8, 0x77, 0xb6, 0x7a, 0x2a, 0xab, 0xd5, 0xb3, 0xec, 0x9d, 0x4d, 0x66, 0x3e, 0xce,
+	0xe9, 0x8b, 0x54, 0x4e, 0xab, 0x79, 0x39, 0x4d, 0xe5, 0x53, 0xe2, 0x7d, 0x5c, 0x63, 0x67, 0x49,
+	0x2c, 0x37, 0x72, 0xed, 0xe8, 0xd4, 0xa0, 0xbf, 0xd2, 0x3f, 0x2a, 0x50, 0xe5, 0x9a, 0xd4, 0x4b,
+	0xd5, 0x9c, 0x25, 0x7d, 0x4f, 0xbf, 0xa9, 0x97, 0xcb, 0x0a, 0xe4, 0x47, 0xf6, 0xb2, 0xfa, 0xee,
+	0xdc, 0xad, 0x31, 0x34, 0xa7, 0x6c, 0xb7, 0x15, 0xcc, 0xbe, 0x29, 0xd6, 0xa5, 0x58, 0x54, 0xe2,
+	0xec, 0x9b, 0x9e, 0x03, 0x2a, 0x21, 0x56, 0x20, 0x9b, 0x73, 0xcf, 0x61, 0xfb, 0xac, 0xe1, 0x14,
+	0x42, 0xd7, 0x66, 0x54, 0xef, 0x6a, 0x32, 0x67, 0xe7, 0x72, 0x0d, 0x2f, 0x81, 0x84, 0xab, 0x4c,
+	0x67, 0x73, 0xb6, 0xc5, 0x98, 0x4b, 0x01, 0x24, 0x42, 0x95, 0x5f, 0x95, 0x51, 0x63, 0xe0, 0x98,
+	0xa4, 0xab, 0x32, 0xf3, 0x51, 0xe0, 0x81, 0x39, 0x9e, 0x42, 0xa8, 0x5d, 0x6a, 0x3f, 0x62, 0x37,
+	0xa2, 0x1d, 0x27, 0xc0, 0x7a, 0x57, 0x6f, 0xdd, 0xd1, 0xd5, 0x4a, 0xff, 0x4c, 0x8f, 0x24, 0x9a,
+	0x91, 0x8d, 0x04, 0xa0, 0x51, 0x1b, 0xb9, 0x36, 0x2f, 0xcc, 0x26, 0x8e, 0x08, 0x3a, 0x86, 0xd0,
+	0xd4, 0x98, 0xd3, 0x33, 0x33, 0x9c, 0x5c, 0x89, 0x6d, 0xe6, 0x75, 0x1a, 0x42, 0xdf, 0x43, 0x6b,
+	0x14, 0xd0, 0xc8, 0xe9, 0xbe, 0xed, 0xf9, 0x76, 0x78, 0x2b, 0x0a, 0xcc, 0xc0, 0x0a, 0x1a, 0xc9,
+	0x19, 0x69, 0xb9, 0xed, 0x58, 0xce, 0x58, 0x91, 0xeb, 0x65, 0xed, 0xa1, 0x48, 0xae, 0xb7, 0x66,
+	0xaf, 0x97, 0xb5, 0xf7, 0x28, 0x96, 0xcb, 0xd8, 0x8b, 0xf3, 0xa9, 0xeb, 0xba, 0x27, 0x8b, 0x8f,
+	0x53, 0xf9, 0x64, 0x08, 0xed, 0xe9, 0xae, 0xe7, 0x5e, 0xda, 0xd3, 0x85, 0x4f, 0xce, 0xcc, 0x49,
+	0x5c, 0x55, 0x3b, 0x4c, 0x30, 0x8f, 0x85, 0x7e, 0x80, 0x6d, 0xd9, 0x35, 0x2f, 0x1c, 0x8a, 0x0d,
+	0x88, 0xe9, 0xbb, 0xb6, 0x3b, 0x15, 0x77, 0x99, 0xfc, 0x3a, 0x43, 0x32, 0xe1, 0xb1, 0xa6, 0x8e,
+	0x86, 0xbe, 0x79, 0x79, 0x69, 0x4f, 0x8c, 0xc9, 0x15, 0xb1, 0x16, 0x0e, 0xf1, 0x03, 0xa4, 0x40,
+	0x3b, 0xa4, 0xe0, 0x12, 0x62, 0x25, 0xde, 0x78, 0xfd, 0xf4, 0x28, 0x33, 0x6e, 0xae, 0x69, 0xe2,
+	0x55, 0x3d, 0xe9, 0x10, 0xca, 0x9a, 0x3a, 0x0a, 0xd0, 0x01, 0x54, 0xec, 0x90, 0xcc, 0xe2, 0xdb,
+	0x26, 0x3e, 0x35, 0x34, 0x75, 0x84, 0x23, 0x86, 0xf4, 0x13, 0xd4, 0x8c, 0xb8, 0x11, 0x9f, 0x65,
+	0xa5, 0x57, 0x3b, 0x96, 0x6b, 0x1c, 0x42, 0x79, 0xa4, 0x2a, 0x77, 0xda, 0xa6, 0x27, 0x52, 0x62,
+	0x1b, 0xe8, 0x4a, 0xe4, 0xd3, 0x82, 0x04, 0xe1, 0x43, 0x86, 0x34, 0xe9, 0x05, 0x80, 0xae, 0xa9,
+	0xb1, 0x46, 0xe6, 0x32, 0x2f, 0xac, 0x5c, 0xe6, 0xd2, 0x00, 0x80, 0xae, 0xc5, 0x65, 0x0f, 0xa1,
+	0x4d, 0xbb, 0x7a, 0x7d, 0x81, 0x55, 0x38, 0x2e, 0xeb, 0x1e, 0x3f, 0x26, 0x22, 0x42, 0xfa, 0x77,
+	0x09, 0xea, 0x1d, 0xc7, 0xf4, 0x67, 0xec, 0xb8, 0xf9, 0x67, 0x09, 0x2a, 0xf4, 0x23, 0x40, 0x55,
+	0x28, 0x0d, 0x34, 0x43, 0xd8, 0x40, 0x2d, 0x80, 0xde, 0x47, 0x45, 0xed, 0x8f, 0xfb, 0x1d, 0x43,
+	0x17, 0x0a, 0xa8, 0x09, 0x75, 0x4d, 0x1d, 0x8d, 0x3b, 0x83, 0x0e, 0x3e, 0x13, 0x8a, 0xe8, 0x2b,
+	0x78, 0x44, 0x49, 0x63, 0xd8, 0xc1, 0xc3, 0x91, 0x3e, 0x3e, 0xe9, 0x28, 0x83, 0x11, 0x96, 0x85,
+	0x12, 0xda, 0x05, 0xc4, 0x18, 0x4a, 0x5f, 0xed, 0x0c, 0xc6, 0x3d, 0xb9, 0x8f, 0x3b, 0x3d, 0x59,
+	0x28, 0xc7, 0x0a, 0x3d, 0xac, 0x9c, 0x0c, 0xc7, 0xda, 0xc9, 0xf8, 0x83, 0xa2, 0xf6, 0xb4, 0x0f,
+	0x42, 0x05, 0xed, 0x83, 0x48, 0x19, 0x03, 0xcd, 0x30, 0x28, 0xae, 0x9d, 0x75, 0x95, 0x71, 0xf7,
+	0x7d, 0x47, 0x55, 0xe5, 0x81, 0xb0, 0x99, 0xac, 0xc3, 0xcc, 0x19, 0xc9, 0x3a, 0x55, 0xf4, 0x1c,
+	0xbe, 0xa3, 0x8c, 0x21, 0xee, 0xa8, 0xc6, 0x99, 0x62, 0x18, 0x8a, 0xa6, 0x8e, 0x15, 0x75, 0x28,
+	0xe3, 0x13, 0x19, 0xcb, 0x6a, 0x57, 0x1e, 0x7f, 0xe8, 0x60, 0x55, 0x51, 0xfb, 0x42, 0x0d, 0xed,
+	0xc1, 0x2e, 0x73, 0xbd, 0x3b, 0x54, 0xce, 0x3b, 0x43, 0x2a, 0x18, 0x9b, 0xa9, 0x23, 0x91, 0x15,
+	0xe7, 0x58, 0xc7, 0x5a, 0x57, 0x36, 0x0c, 0xba, 0x5f, 0x19, 0x63, 0x0d, 0x0b, 0x80, 0x0e, 0x60,
+	0x3f, 0xed, 0xd7, 0xa9, 0xfc, 0x71, 0x6c, 0x7c, 0x54, 0xbb, 0x89, 0x6e, 0x03, 0xed, 0xc0, 0x36,
+	0x95, 0x50, 0x86, 0xa3, 0xb1, 0xae, 0xa9, 0x34, 0x16, 0x43, 0x43, 0xd8, 0x42, 0xdb, 0xd0, 0x4c,
+	0x22, 0x45, 0xd5, 0x85, 0xe6, 0x2a, 0x74, 0x2c, 0xb4, 0xe2, 0x8d, 0xc5, 0x90, 0xde, 0x1d, 0xd3,
+	0x5d, 0x08, 0xed, 0x38, 0x1e, 0x19, 0x46, 0x97, 0x7b, 0x25, 0x20, 0x04, 0xad, 0x34, 0xf7, 0x44,
+	0x11, 0xb6, 0xd1, 0x23, 0x68, 0xa7, 0xb1, 0xce, 0x99, 0x22, 0x20, 0xe9, 0x2d, 0xb4, 0x58, 0x7e,
+	0x75, 0xd3, 0x37, 0x67, 0x24, 0x24, 0x3e, 0x12, 0xa0, 0x74, 0x4a, 0x6e, 0x79, 0x99, 0xd0, 0x4f,
+	0x5a, 0x1a, 0xe7, 0xa6, 0xb3, 0x88, 0x87, 0xfe, 0x88, 0x90, 0xfe, 0x56, 0x60, 0xf6, 0x98, 0x76,
+	0xaa, 0x34, 0x93, 0x6a, 0xe1, 0x16, 0x96, 0xc0, 0x83, 0xa6, 0xb2, 0x5d, 0xd8, 0xa4, 0xc7, 0xec,
+	0x22, 0xe0, 0x97, 0x12, 0xa7, 0xd0, 0xcf, 0x00, 0x89, 0x8b, 0x81, 0x58, 0x66, 0xbd, 0xb5, 0xc3,
+	0x7b, 0x2b, 0xbb, 0x01, 0x9c, 0x12, 0x94, 0x3e, 0x41, 0x5b, 0x1b, 0x0c, 0x33, 0x3e, 0x1e, 0x40,
+	0x83, 0x1d, 0xf7, 0x97, 0xe6, 0x84, 0xf0, 0x91, 0xa0, 0x89, 0xd3, 0x50, 0x72, 0x4b, 0x50, 0x92,
+	0xed, 0xa4, 0x98, 0xba, 0x25, 0x62, 0xf0, 0x2e, 0x4f, 0xe9, 0x03, 0xa1, 0x79, 0x4e, 0xfc, 0xc0,
+	0xf6, 0x5c, 0xbe, 0x27, 0x11, 0xaa, 0xd7, 0x11, 0xc0, 0x63, 0x12, 0x93, 0x34, 0x5e, 0x17, 0x0b,
+	0xdb, 0xb1, 0x86, 0xf6, 0x2c, 0x79, 0x52, 0x25, 0x00, 0x3d, 0x91, 0x27, 0x6c, 0xea, 0x79, 0x6f,
+	0x06, 0x57, 0x7c, 0x95, 0x14, 0x42, 0xb5, 0xa7, 0x76, 0xc8, 0x9d, 0x88, 0xe6, 0xd3, 0x25, 0x20,
+	0xbd, 0x85, 0xda, 0xc0, 0x9b, 0x0e, 0xc8, 0x35, 0x71, 0x68, 0x06, 0x1d, 0xfa, 0xc1, 0xd7, 0x8f,
+	0x08, 0xba, 0x83, 0x89, 0xe9, 0x38, 0x3c, 0x13, 0x35, 0xcc, 0x29, 0x49, 0x86, 0x1a, 0x26, 0xc1,
+	0xdc, 0x73, 0x03, 0x82, 0x9e, 0x42, 0x23, 0x60, 0xf6, 0xc6, 0x13, 0xcf, 0x22, 0x7c, 0x80, 0x82,
+	0x08, 0xea, 0x7a, 0x16, 0xa1, 0x9b, 0x9b, 0x91, 0x20, 0x30, 0xa7, 0xf1, 0x06, 0x62, 0x52, 0xfa,
+	0x6b, 0x01, 0x1a, 0xf4, 0x36, 0x8f, 0x03, 0xff, 0x1c, 0x36, 0x35, 0x77, 0x81, 0xc9, 0x27, 0x7e,
+	0x7e, 0x6f, 0xa7, 0x8e, 0xdd, 0x48, 0x04, 0x73, 0x01, 0xf4, 0x0e, 0xb6, 0x8c, 0xc5, 0x45, 0x87,
+	0x4d, 0x93, 0xe7, 0xa6, 0xc3, 0x2c, 0xb7, 0x92, 0x7c, 0x27, 0x2c, 0x76, 0x16, 0xe1, 0x8c, 0x28,
+	0x2d, 0xb2, 0xbe, 0xef, 0x2d, 0xe6, 0xf1, 0xfd, 0x14, 0x85, 0x2d, 0x83, 0x49, 0xa7, 0x50, 0xa1,
+	0x8f, 0x92, 0x00, 0x7d, 0x0d, 0x70, 0xe9, 0x78, 0x37, 0xe3, 0x09, 0xfb, 0xef, 0x80, 0x9f, 0xa5,
+	0x14, 0x89, 0xfe, 0x39, 0xf8, 0x16, 0x2a, 0x94, 0xa0, 0xa3, 0x13, 0xad, 0xb7, 0xe6, 0x51, 0xfc,
+	0xe7, 0x07, 0xd5, 0xc6, 0x11, 0x4f, 0x7a, 0x0a, 0x55, 0x9a, 0x2d, 0x6f, 0x11, 0xd2, 0x30, 0x5b,
+	0xc4, 0x31, 0x6f, 0xb9, 0xa5, 0x88, 0x90, 0xaa, 0x50, 0x91, 0x67, 0xf3, 0xf0, 0xf6, 0xc5, 0x3e,
+	0x54, 0xf9, 0xf8, 0x46, 0xcf, 0x4f, 0x79, 0xf8, 0x5e, 0xd8, 0x40, 0x35, 0x28, 0xeb, 0xda, 0xd0,
+	0x10, 0x0a, 0x2f, 0x5e, 0x41, 0x2b, 0xbb, 0x31, 0xca, 0xfb, 0x55, 0x53, 0xe8, 0x43, 0xb0, 0x0e,
+	0x95, 0x81, 0xdc, 0x39, 0x97, 0x85, 0x02, 0x02, 0xd8, 0xa4, 0xe0, 0xf9, 0x1b, 0xa1, 0xf8, 0xfa,
+	0xb7, 0x2d, 0xa8, 0x1c, 0x1f, 0x1b, 0xf6, 0x0c, 0xbd, 0x84, 0x2a, 0xaf, 0x39, 0xb4, 0xc5, 0xa3,
+	0xc4, 0xd6, 0xdc, 0x7b, 0xcc, 0xa9, 0x4c, 0x45, 0x4a, 0x1b, 0xe8, 0x15, 0x34, 0x0c, 0x12, 0x26,
+	0x05, 0xd2, 0xe6, 0x62, 0x31, 0xb0, 0xb7, 0x0a, 0x48, 0x1b, 0xe8, 0x19, 0x6c, 0xf6, 0x49, 0x48,
+	0xdf, 0xf8, 0xd9, 0x25, 0x60, 0xf9, 0x58, 0x93, 0x36, 0xd0, 0x1f, 0x41, 0x8c, 0xa4, 0x72, 0x5e,
+	0x7a, 0x4f, 0x3f, 0xf3, 0x20, 0xde, 0xdb, 0xbf, 0x47, 0x20, 0x90, 0x36, 0xd0, 0x8f, 0x00, 0xba,
+	0x77, 0x43, 0x7c, 0xcf, 0x5d, 0x77, 0x23, 0xf6, 0x38, 0x2e, 0x5d, 0x69, 0x03, 0x1d, 0x41, 0xc3,
+	0xb8, 0x5a, 0x84, 0x96, 0x77, 0xf3, 0x30, 0xf9, 0x1f, 0xa0, 0x8e, 0xc9, 0x85, 0xe7, 0x85, 0x0f,
+	0x92, 0xa6, 0x09, 0x0b, 0xbd, 0xf9, 0x14, 0xeb, 0x5d, 0x3a, 0x0b, 0x10, 0xff, 0xf3, 0x2a, 0xaf,
+	0xa1, 0x6d, 0x84, 0xa6, 0x1f, 0x7e, 0x89, 0xce, 0x2f, 0xb0, 0x8d, 0x49, 0xb0, 0xa2, 0x15, 0x0f,
+	0x21, 0xbc, 0xf2, 0xf2, 0xf4, 0x9e, 0x47, 0xe9, 0x52, 0x47, 0x68, 0xbd, 0xd1, 0xf6, 0x52, 0x23,
+	0x8f, 0xb4, 0x81, 0xbe, 0xa7, 0xe3, 0x76, 0xc8, 0x46, 0xa3, 0xac, 0x3b, 0x8d, 0xa5, 0x18, 0x0d,
+	0xff, 0x1b, 0x68, 0xf4, 0x49, 0x98, 0x0c, 0x46, 0xdb, 0xa9, 0xd9, 0x86, 0xdb, 0x6d, 0x67, 0x87,
+	0xa3, 0x80, 0x25, 0x01, 0xa8, 0x71, 0x77, 0x31, 0x72, 0xed, 0x20, 0xcf, 0x97, 0xc6, 0xd2, 0x0c,
+	0x5f, 0x24, 0x49, 0x5a, 0xbe, 0xf3, 0x77, 0x04, 0x96, 0x2b, 0x75, 0x1c, 0x27, 0x67, 0x27, 0x39,
+	0x3a, 0xef, 0x60, 0x3b, 0xb5, 0x50, 0xa0, 0xb9, 0xba, 0xa6, 0x26, 0xcb, 0x2d, 0xe7, 0xad, 0xfc,
+	0xe5, 0x92, 0x3a, 0x7c, 0xb0, 0x8b, 0xaf, 0xa0, 0xc5, 0x75, 0x1e, 0xec, 0xe1, 0x5b, 0x10, 0x96,
+	0xcb, 0x7c, 0x91, 0x83, 0xbf, 0x83, 0x2d, 0x5e, 0x34, 0xd1, 0x63, 0xec, 0x9e, 0x54, 0xa5, 0xb4,
+	0xde, 0x40, 0x83, 0x6b, 0xb1, 0x37, 0xda, 0xc3, 0x94, 0x8e, 0x61, 0xc7, 0x60, 0xf9, 0x65, 0xb7,
+	0xac, 0xe2, 0x5a, 0xf6, 0xc4, 0xa4, 0x67, 0x18, 0xda, 0x5d, 0x86, 0x25, 0x7d, 0x01, 0xdf, 0x63,
+	0x83, 0x76, 0xfd, 0x1d, 0x36, 0xb2, 0x97, 0x78, 0x9e, 0x8d, 0x1f, 0xa1, 0xd6, 0x27, 0x61, 0x74,
+	0xae, 0xe7, 0x64, 0x24, 0x0e, 0x36, 0x13, 0x60, 0xb1, 0x6d, 0x77, 0xaf, 0x4c, 0x77, 0x4a, 0xe8,
+	0x15, 0x15, 0xbd, 0xec, 0x10, 0x17, 0x49, 0x5d, 0x5a, 0x79, 0x0b, 0x9d, 0xc2, 0x57, 0x51, 0x41,
+	0xaf, 0xbf, 0x55, 0x72, 0xd6, 0x7d, 0xb2, 0x84, 0xd6, 0xe4, 0x93, 0xd6, 0x63, 0xad, 0x91, 0xdf,
+	0x7a, 0xbc, 0x2b, 0x7e, 0xa6, 0x33, 0xc9, 0xb5, 0xe9, 0xd8, 0x96, 0x19, 0x92, 0x33, 0x2b, 0x78,
+	0x58, 0xd1, 0x1d, 0x7f, 0xf7, 0x87, 0x6f, 0xa7, 0x76, 0x78, 0xb5, 0xb8, 0x38, 0x9a, 0x78, 0x33,
+	0xf6, 0xdf, 0xfd, 0xc4, 0xf3, 0x2d, 0xfe, 0x67, 0x7f, 0xf2, 0xb7, 0xff, 0xc5, 0x26, 0xfb, 0xaf,
+	0xfe, 0xcd, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xb6, 0xf0, 0x65, 0x56, 0x0a, 0x18, 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 d8943e7..d990566 100644
--- a/api/bbsim/bbsim.proto
+++ b/api/bbsim/bbsim.proto
@@ -123,6 +123,14 @@
     string InternalState = 12;
     string IGMPState = 13;
     uint32 UniId = 14;
+    int32 UniTagMatch = 15;
+    uint32 UsCTagPriority = 16; //Upstream
+    uint32 UsSTagPriority = 17; //Upstream
+    uint32 DsCTagPriority = 18; //Downstream
+    uint32 DsSTagPriority = 19; //Downstream
+    bool NeedsPPPoE = 20;
+    bool ConfigureMacAddress = 21;
+    bool EnableMacLearning = 22;
 }
 
 message ONUTrafficSchedulers {
diff --git a/internal/bbsim/api/services_handler.go b/internal/bbsim/api/services_handler.go
index 32b7794..e947a97 100644
--- a/internal/bbsim/api/services_handler.go
+++ b/internal/bbsim/api/services_handler.go
@@ -26,20 +26,28 @@
 
 func convertBBSimServiceToProtoService(s *devices.Service) *bbsim.Service {
 	return &bbsim.Service{
-		Name:          s.Name,
-		InternalState: s.InternalState.Current(),
-		HwAddress:     s.HwAddress.String(),
-		OnuSn:         s.UniPort.Onu.Sn(),
-		UniId:         s.UniPort.ID,
-		CTag:          int32(s.CTag),
-		STag:          int32(s.STag),
-		NeedsEapol:    s.NeedsEapol,
-		NeedsDhcp:     s.NeedsDhcp,
-		NeedsIgmp:     s.NeedsIgmp,
-		GemPort:       int32(s.GemPort),
-		EapolState:    s.EapolState.Current(),
-		DhcpState:     s.DHCPState.Current(),
-		IGMPState:     s.IGMPState.Current(),
+		Name:                s.Name,
+		InternalState:       s.InternalState.Current(),
+		HwAddress:           s.HwAddress.String(),
+		OnuSn:               s.UniPort.Onu.Sn(),
+		UniId:               s.UniPort.ID,
+		UniTagMatch:         int32(s.UniTagMatch),
+		CTag:                int32(s.CTag),
+		UsCTagPriority:      uint32(s.UsPonCTagPriority),
+		DsCTagPriority:      uint32(s.DsPonCTagPriority),
+		STag:                int32(s.STag),
+		UsSTagPriority:      uint32(s.UsPonSTagPriority),
+		DsSTagPriority:      uint32(s.DsPonSTagPriority),
+		NeedsEapol:          s.NeedsEapol,
+		NeedsDhcp:           s.NeedsDhcp,
+		NeedsIgmp:           s.NeedsIgmp,
+		NeedsPPPoE:          s.NeedsPPPoE,
+		ConfigureMacAddress: s.ConfigureMacAddress,
+		EnableMacLearning:   s.EnableMacLearning,
+		GemPort:             int32(s.GemPort),
+		EapolState:          s.EapolState.Current(),
+		DhcpState:           s.DHCPState.Current(),
+		IGMPState:           s.IGMPState.Current(),
 	}
 }
 
diff --git a/internal/bbsimctl/commands/services.go b/internal/bbsimctl/commands/services.go
index 1f3216a..e015791 100644
--- a/internal/bbsimctl/commands/services.go
+++ b/internal/bbsimctl/commands/services.go
@@ -19,16 +19,17 @@
 
 import (
 	"context"
+	"os"
+
 	"github.com/jessevdk/go-flags"
 	pb "github.com/opencord/bbsim/api/bbsim"
 	"github.com/opencord/bbsim/internal/bbsimctl/config"
 	"github.com/opencord/cordctl/pkg/format"
 	log "github.com/sirupsen/logrus"
-	"os"
 )
 
 const (
-	DEFAULT_SERVICE_HEADER_FORMAT = "table{{ .OnuSn }}\t{{ .UniId }}\t{{ .InternalState }}\t{{ .Name }}\t{{ .HwAddress }}\t{{ .STag }}\t{{ .CTag }}\t{{ .NeedsEapol }}\t{{ .NeedsDhcp }}\t{{ .NeedsIgmp }}\t{{ .GemPort }}\t{{ .EapolState }}\t{{ .DhcpState }}\t{{ .IGMPState }}"
+	DEFAULT_SERVICE_HEADER_FORMAT = "table{{ .OnuSn }}\t{{ .UniId }}\t{{ .InternalState }}\t{{ .Name }}\t{{ .HwAddress }}\t{{ .STag }}\t{{ .UsSTagPriority }}\t{{ .DsSTagPriority }}\t{{ .CTag }}\t{{ .UsCTagPriority }}\t{{ .DsCTagPriority }}\t{{ .UniTagMatch }}\t{{ .NeedsEapol }}\t{{ .NeedsDhcp }}\t{{ .NeedsIgmp }}\t{{ .NeedsPPPoE }}\t{{ .ConfigureMacAddress }}\t{{ .EnableMacLearning }}\t{{ .GemPort }}\t{{ .EapolState }}\t{{ .DhcpState }}\t{{ .IGMPState }}"
 )
 
 type ServiceList struct{}