diff --git a/pb/trace.pb.go b/pb/trace.pb.go
index b7283142aa51ddf35583a7c548041bc7dbccb88e..75c1f786b092c6c1270f88635cfdfd8297136bb6 100644
--- a/pb/trace.pb.go
+++ b/pb/trace.pb.go
@@ -320,6 +320,7 @@ type TraceEvent_RejectMessage struct {
 	MessageID            []byte   `protobuf:"bytes,1,opt,name=messageID" json:"messageID,omitempty"`
 	ReceivedFrom         []byte   `protobuf:"bytes,2,opt,name=receivedFrom" json:"receivedFrom,omitempty"`
 	Reason               *string  `protobuf:"bytes,3,opt,name=reason" json:"reason,omitempty"`
+	Topics               []string `protobuf:"bytes,4,rep,name=topics" json:"topics,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -379,9 +380,17 @@ func (m *TraceEvent_RejectMessage) GetReason() string {
 	return ""
 }
 
+func (m *TraceEvent_RejectMessage) GetTopics() []string {
+	if m != nil {
+		return m.Topics
+	}
+	return nil
+}
+
 type TraceEvent_DuplicateMessage struct {
 	MessageID            []byte   `protobuf:"bytes,1,opt,name=messageID" json:"messageID,omitempty"`
 	ReceivedFrom         []byte   `protobuf:"bytes,2,opt,name=receivedFrom" json:"receivedFrom,omitempty"`
+	Topics               []string `protobuf:"bytes,3,rep,name=topics" json:"topics,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -434,8 +443,16 @@ func (m *TraceEvent_DuplicateMessage) GetReceivedFrom() []byte {
 	return nil
 }
 
+func (m *TraceEvent_DuplicateMessage) GetTopics() []string {
+	if m != nil {
+		return m.Topics
+	}
+	return nil
+}
+
 type TraceEvent_DeliverMessage struct {
 	MessageID            []byte   `protobuf:"bytes,1,opt,name=messageID" json:"messageID,omitempty"`
+	Topics               []string `protobuf:"bytes,2,rep,name=topics" json:"topics,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -481,6 +498,13 @@ func (m *TraceEvent_DeliverMessage) GetMessageID() []byte {
 	return nil
 }
 
+func (m *TraceEvent_DeliverMessage) GetTopics() []string {
+	if m != nil {
+		return m.Topics
+	}
+	return nil
+}
+
 type TraceEvent_AddPeer struct {
 	PeerID               []byte   `protobuf:"bytes,1,opt,name=peerID" json:"peerID,omitempty"`
 	Proto                *string  `protobuf:"bytes,2,opt,name=proto" json:"proto,omitempty"`
@@ -1477,70 +1501,64 @@ func init() {
 func init() { proto.RegisterFile("trace.proto", fileDescriptor_0571941a1d628a80) }
 
 var fileDescriptor_0571941a1d628a80 = []byte{
-	// 993 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xdb, 0x6e, 0xdb, 0x46,
-	0x10, 0x86, 0x4b, 0x1d, 0x2c, 0x69, 0x24, 0xcb, 0xec, 0xb6, 0x2e, 0x08, 0x36, 0x31, 0x54, 0x37,
-	0x08, 0x04, 0x14, 0x10, 0x10, 0x03, 0x45, 0x2e, 0x9a, 0x04, 0x95, 0x45, 0xda, 0x96, 0x21, 0xdb,
-	0xc4, 0x48, 0x76, 0x2f, 0x5d, 0x4a, 0xda, 0xc6, 0x0c, 0x24, 0x92, 0x20, 0x57, 0x2a, 0xf2, 0x00,
-	0x7d, 0xb7, 0xdc, 0xb5, 0x8f, 0x50, 0xf8, 0x41, 0x8a, 0x62, 0x77, 0x49, 0xea, 0x60, 0x92, 0x49,
-	0xdd, 0xdc, 0x71, 0x96, 0xff, 0x37, 0x3b, 0xbb, 0x9c, 0x7f, 0x40, 0xa8, 0xb3, 0xc0, 0x9e, 0xd0,
-	0x8e, 0x1f, 0x78, 0xcc, 0x23, 0x35, 0x7f, 0x31, 0x0e, 0x17, 0xe3, 0x8e, 0x3f, 0x3e, 0xfc, 0x67,
-	0x1f, 0x60, 0xc4, 0x5f, 0x99, 0x4b, 0xea, 0x32, 0xd2, 0x81, 0x12, 0x7b, 0xef, 0x53, 0x4d, 0x69,
-	0x29, 0xed, 0xe6, 0x91, 0xde, 0x49, 0x84, 0x9d, 0x95, 0xa8, 0x33, 0x7a, 0xef, 0x53, 0x14, 0x3a,
-	0xf2, 0x0d, 0xec, 0xf8, 0x94, 0x06, 0x7d, 0x43, 0x2b, 0xb4, 0x94, 0x76, 0x03, 0xa3, 0x88, 0x3c,
-	0x81, 0x1a, 0x73, 0xe6, 0x34, 0x64, 0xf6, 0xdc, 0xd7, 0x8a, 0x2d, 0xa5, 0x5d, 0xc4, 0xd5, 0x02,
-	0x19, 0x40, 0xd3, 0x5f, 0x8c, 0x67, 0x4e, 0x78, 0x77, 0x41, 0xc3, 0xd0, 0x7e, 0x4b, 0xb5, 0x52,
-	0x4b, 0x69, 0xd7, 0x8f, 0x9e, 0xa5, 0xef, 0x67, 0x6d, 0x68, 0x71, 0x8b, 0x25, 0x7d, 0xd8, 0x0d,
-	0xe8, 0x3b, 0x3a, 0x61, 0x71, 0xb2, 0xb2, 0x48, 0xf6, 0x7d, 0x7a, 0x32, 0x5c, 0x97, 0xe2, 0x26,
-	0x49, 0x10, 0xd4, 0xe9, 0xc2, 0x9f, 0x39, 0x13, 0x9b, 0xd1, 0x38, 0xdb, 0x8e, 0xc8, 0xf6, 0x3c,
-	0x3d, 0x9b, 0xb1, 0xa5, 0xc6, 0x07, 0x3c, 0x3f, 0xec, 0x94, 0xce, 0x9c, 0x25, 0x0d, 0xe2, 0x8c,
-	0x95, 0xbc, 0xc3, 0x1a, 0x1b, 0x5a, 0xdc, 0x62, 0xc9, 0x4b, 0xa8, 0xd8, 0xd3, 0xa9, 0x45, 0x69,
-	0xa0, 0x55, 0x45, 0x9a, 0xa7, 0xe9, 0x69, 0xba, 0x52, 0x84, 0xb1, 0x9a, 0xfc, 0x0c, 0x10, 0xd0,
-	0xb9, 0xb7, 0xa4, 0x82, 0xad, 0x09, 0xb6, 0x95, 0x75, 0x45, 0xb1, 0x0e, 0xd7, 0x18, 0xbe, 0x75,
-	0x40, 0x27, 0x4b, 0xb4, 0x7a, 0x1a, 0xe4, 0x6d, 0x8d, 0x52, 0x84, 0xb1, 0x9a, 0x83, 0x21, 0x75,
-	0xa7, 0x1c, 0xac, 0xe7, 0x81, 0x43, 0x29, 0xc2, 0x58, 0xcd, 0xc1, 0x69, 0xe0, 0xf9, 0x1c, 0x6c,
-	0xe4, 0x81, 0x86, 0x14, 0x61, 0xac, 0xe6, 0x6d, 0xfc, 0xce, 0x73, 0x5c, 0x6d, 0x57, 0x50, 0x19,
-	0x6d, 0x7c, 0xee, 0x39, 0x2e, 0x0a, 0x1d, 0x79, 0x01, 0xe5, 0x19, 0xb5, 0x97, 0x54, 0x6b, 0x0a,
-	0xe0, 0xdb, 0x74, 0x60, 0xc0, 0x25, 0x28, 0x95, 0x1c, 0x79, 0x1b, 0xd8, 0xbf, 0x31, 0x6d, 0x2f,
-	0x0f, 0x39, 0xe5, 0x12, 0x94, 0x4a, 0x8e, 0xf8, 0xc1, 0xc2, 0xa5, 0x9a, 0x9a, 0x87, 0x58, 0x5c,
-	0x82, 0x52, 0xa9, 0x9f, 0x40, 0x73, 0xb3, 0xfb, 0xb9, 0xb3, 0xe6, 0xf2, 0xb1, 0x6f, 0x08, 0x9b,
-	0x36, 0x70, 0xb5, 0xc0, 0xfd, 0xc8, 0x3c, 0xdf, 0x99, 0x84, 0x5a, 0xa1, 0x55, 0x6c, 0xd7, 0x30,
-	0x8a, 0x74, 0x07, 0x76, 0x37, 0x1a, 0xff, 0x23, 0x69, 0x0e, 0xa1, 0x11, 0xd0, 0x09, 0x75, 0x96,
-	0x74, 0x7a, 0x12, 0x78, 0xf3, 0xc8, 0xdc, 0x1b, 0x6b, 0x7c, 0xab, 0x80, 0xda, 0xa1, 0xe7, 0x0a,
-	0x7f, 0xd7, 0x30, 0x8a, 0xf4, 0x11, 0xa8, 0xdb, 0xae, 0xf8, 0xff, 0xbb, 0xe9, 0x1d, 0x68, 0x6e,
-	0x3a, 0x23, 0x3f, 0xa7, 0xfe, 0x12, 0x2a, 0x91, 0x05, 0xd6, 0x66, 0x94, 0xb2, 0x31, 0xa3, 0xbe,
-	0xe6, 0x9f, 0xc3, 0x63, 0x9e, 0xd8, 0xaf, 0x86, 0x32, 0xd0, 0x9f, 0x01, 0xac, 0xfa, 0x3f, 0x8b,
-	0xd5, 0x7f, 0x85, 0x4a, 0xd4, 0xe6, 0x0f, 0xaa, 0x57, 0x52, 0xee, 0xea, 0x05, 0x94, 0xe6, 0x94,
-	0xd9, 0x62, 0xa7, 0x6c, 0xdf, 0x58, 0xbd, 0x0b, 0xca, 0x6c, 0x14, 0x52, 0x7d, 0x04, 0x95, 0xc8,
-	0x0f, 0xbc, 0x08, 0xee, 0x88, 0x91, 0x17, 0x17, 0x21, 0xa3, 0x47, 0x66, 0x8d, 0xcc, 0xf2, 0x39,
-	0xb3, 0x3e, 0x81, 0x12, 0x37, 0x13, 0xbf, 0x51, 0xd1, 0x6f, 0x22, 0x63, 0x0d, 0x65, 0xa0, 0x3f,
-	0x85, 0xb2, 0x70, 0xce, 0xea, 0x75, 0x61, 0xfd, 0xf5, 0x8f, 0x50, 0x16, 0x2e, 0xc9, 0xfb, 0x4e,
-	0xe9, 0x98, 0x70, 0xca, 0x7f, 0xc4, 0x3e, 0x28, 0x50, 0x89, 0x8a, 0x27, 0xaf, 0xa1, 0x1a, 0x35,
-	0x4c, 0xa8, 0x29, 0xad, 0x62, 0xbb, 0x7e, 0xf4, 0x5d, 0xfa, 0x69, 0xa3, 0x96, 0x13, 0x27, 0x4e,
-	0x10, 0xd2, 0x85, 0x46, 0xb8, 0x18, 0x87, 0x93, 0xc0, 0xf1, 0x99, 0xe3, 0xb9, 0xc2, 0x71, 0xd9,
-	0xb3, 0x6d, 0x31, 0x16, 0xf8, 0x06, 0x42, 0x7e, 0x82, 0xca, 0xc4, 0x73, 0x59, 0xe0, 0xcd, 0x84,
-	0x89, 0x32, 0x0b, 0xe8, 0x49, 0x91, 0xc8, 0x10, 0x13, 0x7a, 0x0f, 0xea, 0x6b, 0x85, 0x3d, 0x72,
-	0x30, 0xbc, 0x86, 0x4a, 0x54, 0x1a, 0x4f, 0x10, 0x15, 0x37, 0x96, 0x3f, 0x00, 0x55, 0x5c, 0x2d,
-	0x64, 0x5c, 0xe7, 0x1f, 0x05, 0xa8, 0xaf, 0x15, 0x47, 0x5e, 0x41, 0xd9, 0xb9, 0xe3, 0x83, 0x54,
-	0xde, 0xe7, 0xf3, 0xdc, 0xe3, 0xf4, 0xcf, 0xec, 0xa5, 0xbc, 0x54, 0x09, 0x09, 0xfa, 0x77, 0xdb,
-	0x65, 0xd1, 0x55, 0x7e, 0x84, 0xfe, 0xc5, 0x76, 0x59, 0x44, 0x73, 0x88, 0xd3, 0x72, 0x22, 0x17,
-	0x3f, 0x81, 0x16, 0x2d, 0x27, 0x69, 0x39, 0x9c, 0x5f, 0xc5, 0xc3, 0xb9, 0xf4, 0x09, 0xb4, 0xe8,
-	0x3c, 0x49, 0xcb, 0x39, 0x7d, 0x06, 0xea, 0xf6, 0xa1, 0xd2, 0xdd, 0x40, 0x0e, 0x00, 0x92, 0xaf,
-	0x22, 0x3f, 0x46, 0x03, 0xd7, 0x56, 0xf4, 0xa3, 0x55, 0xa6, 0xf8, 0x80, 0x5b, 0x8c, 0xf2, 0x80,
-	0x69, 0x27, 0x4c, 0x72, 0xac, 0x0c, 0x2f, 0xbe, 0x49, 0x94, 0xc9, 0x11, 0x32, 0xea, 0xe4, 0xd3,
-	0x91, 0xd2, 0x20, 0x2e, 0x51, 0x06, 0x87, 0x7f, 0x2a, 0x50, 0xe2, 0xbf, 0x7f, 0xe4, 0x2b, 0xd8,
-	0xb3, 0xae, 0x8f, 0x07, 0xfd, 0xe1, 0xd9, 0xed, 0x85, 0x39, 0x1c, 0x76, 0x4f, 0x4d, 0xf5, 0x0b,
-	0x42, 0xa0, 0x89, 0xe6, 0xb9, 0xd9, 0x1b, 0x25, 0x6b, 0x0a, 0xd9, 0x87, 0x2f, 0x8d, 0x6b, 0x6b,
-	0xd0, 0xef, 0x75, 0x47, 0x66, 0xb2, 0x5c, 0xe0, 0xbc, 0x61, 0x0e, 0xfa, 0x37, 0x26, 0x26, 0x8b,
-	0x45, 0xd2, 0x80, 0x6a, 0xd7, 0x30, 0x6e, 0x2d, 0xd3, 0x44, 0xb5, 0x44, 0xf6, 0xa0, 0x8e, 0xe6,
-	0xc5, 0xd5, 0x8d, 0x29, 0x17, 0xca, 0xfc, 0x35, 0x9a, 0xbd, 0x9b, 0x5b, 0xb4, 0x7a, 0xea, 0x0e,
-	0x8f, 0x86, 0xe6, 0xa5, 0x21, 0xa2, 0x0a, 0x8f, 0x0c, 0xbc, 0xb2, 0x44, 0x54, 0x25, 0x55, 0x28,
-	0x9d, 0x5f, 0xf5, 0x2f, 0xd5, 0x1a, 0xa9, 0x41, 0x79, 0x60, 0x76, 0x6f, 0x4c, 0x15, 0xf8, 0xe3,
-	0x29, 0x76, 0x4f, 0x46, 0x6a, 0x9d, 0x3f, 0x5a, 0x78, 0x7d, 0x69, 0xaa, 0x8d, 0xc3, 0x37, 0xb0,
-	0xb7, 0xfa, 0xbe, 0xc7, 0x36, 0x9b, 0xdc, 0x91, 0x1f, 0xa0, 0x3c, 0xe6, 0x0f, 0x51, 0x13, 0xef,
-	0xa7, 0xb6, 0x02, 0x4a, 0xcd, 0x71, 0xe3, 0xc3, 0xfd, 0x81, 0xf2, 0xd7, 0xfd, 0x81, 0xf2, 0xf7,
-	0xfd, 0x81, 0xf2, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x05, 0x62, 0xa3, 0xb7, 0x67, 0x0b, 0x00,
-	0x00,
+	// 906 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x96, 0xd1, 0x6e, 0xe3, 0x44,
+	0x14, 0x86, 0x71, 0x63, 0xc7, 0xf1, 0x89, 0xe3, 0xba, 0x03, 0x45, 0x56, 0x80, 0x2a, 0x5b, 0x56,
+	0x55, 0xc4, 0x4a, 0xd1, 0xaa, 0x65, 0x85, 0x84, 0xb8, 0x20, 0x8d, 0xdd, 0x6e, 0x4a, 0xda, 0x5a,
+	0x4e, 0x5a, 0xb8, 0xab, 0x1c, 0x67, 0xd8, 0x7a, 0x95, 0xd8, 0x96, 0x3d, 0x09, 0xda, 0x27, 0x82,
+	0x47, 0xe1, 0x0e, 0x1e, 0x01, 0xf5, 0x8e, 0xb7, 0x40, 0x33, 0x63, 0x3b, 0x89, 0xd7, 0xc9, 0x06,
+	0xb8, 0x9b, 0x19, 0x7f, 0xff, 0x39, 0x67, 0xce, 0xfc, 0x33, 0x09, 0xd4, 0x49, 0xec, 0x7a, 0xb8,
+	0x13, 0xc5, 0x21, 0x09, 0x91, 0x12, 0xcd, 0xc7, 0xc9, 0x7c, 0xdc, 0x89, 0xc6, 0xc7, 0xbf, 0x21,
+	0x80, 0x11, 0xfd, 0x64, 0x2d, 0x70, 0x40, 0x50, 0x1b, 0x44, 0xf2, 0x2e, 0xc2, 0x86, 0xd0, 0x12,
+	0xda, 0xda, 0x69, 0xb3, 0x93, 0x83, 0x9d, 0x25, 0xd4, 0x19, 0xbd, 0x8b, 0x30, 0xd2, 0xa0, 0x1a,
+	0x61, 0x1c, 0xf7, 0x4d, 0x63, 0xaf, 0x25, 0xb4, 0x55, 0x74, 0x00, 0x0a, 0xf1, 0x67, 0x38, 0x21,
+	0xee, 0x2c, 0x32, 0x2a, 0x2d, 0xa1, 0x5d, 0x41, 0xdf, 0x81, 0x16, 0xcd, 0xc7, 0x53, 0x3f, 0x79,
+	0xbc, 0xc6, 0x49, 0xe2, 0xbe, 0xc1, 0x86, 0xd8, 0x12, 0xda, 0xf5, 0xd3, 0xe7, 0xe5, 0x61, 0xed,
+	0x35, 0x16, 0x7d, 0x0b, 0x8d, 0x18, 0xbf, 0xc5, 0x1e, 0xc9, 0xc4, 0x12, 0x13, 0x7f, 0x59, 0x2e,
+	0x76, 0x56, 0x51, 0xf4, 0x3d, 0xe8, 0x93, 0x79, 0x34, 0xf5, 0x3d, 0x97, 0xe0, 0x4c, 0x5e, 0x65,
+	0xf2, 0x93, 0x72, 0xb9, 0x59, 0xa0, 0x69, 0xed, 0x13, 0x3c, 0xf5, 0x17, 0x38, 0xce, 0xf4, 0xf2,
+	0xb6, 0xda, 0xcd, 0x35, 0x16, 0x75, 0x40, 0x76, 0x27, 0x13, 0x1b, 0xe3, 0xd8, 0xa8, 0x31, 0xd9,
+	0x17, 0xe5, 0xb2, 0x2e, 0x87, 0xd0, 0xd7, 0x00, 0x31, 0x9e, 0x85, 0x0b, 0xcc, 0x24, 0x0a, 0x93,
+	0xb4, 0x36, 0x6d, 0x34, 0xe3, 0x68, 0x96, 0x18, 0x7b, 0x0b, 0xc7, 0xee, 0x19, 0xb0, 0x2d, 0x8b,
+	0xc3, 0x21, 0xca, 0x27, 0x38, 0x98, 0x50, 0xbe, 0xbe, 0x8d, 0x1f, 0x72, 0x88, 0xf2, 0x93, 0x38,
+	0x8c, 0x28, 0xaf, 0x6e, 0xe3, 0x4d, 0x0e, 0x51, 0xf3, 0xbc, 0x0d, 0xfd, 0xc0, 0x68, 0x30, 0x78,
+	0x83, 0x79, 0xae, 0x42, 0x3f, 0x40, 0x5f, 0x81, 0x34, 0xc5, 0xee, 0x02, 0x1b, 0x1a, 0x43, 0x3f,
+	0x2b, 0x47, 0x07, 0x14, 0xa1, 0xec, 0x9b, 0xd8, 0xfd, 0x99, 0x18, 0xfb, 0xdb, 0xd8, 0x4b, 0x8a,
+	0x50, 0x36, 0x8a, 0xe7, 0x01, 0x36, 0xf4, 0x6d, 0xac, 0x4d, 0x91, 0xe6, 0x19, 0x68, 0x05, 0xc7,
+	0x1d, 0x80, 0x32, 0xe3, 0xc3, 0xbe, 0xc9, 0x6e, 0x80, 0x4a, 0x5d, 0x4e, 0xc2, 0xc8, 0xf7, 0x12,
+	0x63, 0xaf, 0x55, 0x69, 0x2b, 0xcd, 0x9f, 0xa0, 0xb1, 0xee, 0xb4, 0x12, 0xcd, 0x27, 0xa0, 0xc6,
+	0xd8, 0xc3, 0xfe, 0x02, 0x4f, 0x2e, 0xe2, 0x70, 0x96, 0xde, 0x0f, 0x0d, 0xaa, 0x31, 0x76, 0x93,
+	0x30, 0x60, 0x97, 0x43, 0x59, 0x89, 0x2c, 0xb2, 0xc8, 0x3f, 0x80, 0xfe, 0x9e, 0x09, 0xff, 0x4d,
+	0xf0, 0x34, 0x58, 0x85, 0x05, 0x3b, 0x03, 0xad, 0xe0, 0xc8, 0x1d, 0xf6, 0xd6, 0x06, 0x39, 0xf3,
+	0xe3, 0xf2, 0x72, 0x73, 0xb4, 0x41, 0xfb, 0x1a, 0x92, 0x90, 0xa5, 0x53, 0x9a, 0x9f, 0x03, 0xac,
+	0xd8, 0xb0, 0x00, 0x37, 0x07, 0x20, 0x67, 0x8e, 0x2b, 0x56, 0xcb, 0xa3, 0xbd, 0x00, 0x71, 0x86,
+	0x89, 0xcb, 0x82, 0x6d, 0x36, 0xad, 0xdd, 0xbb, 0xc6, 0xc4, 0x6d, 0x5e, 0x80, 0x9c, 0xf9, 0x51,
+	0x83, 0x2a, 0xf5, 0xef, 0x28, 0xfc, 0x8f, 0x71, 0x32, 0x9f, 0xfe, 0xaf, 0x38, 0x87, 0x20, 0x32,
+	0x0b, 0x37, 0x40, 0x62, 0xdd, 0x63, 0x31, 0x94, 0xe6, 0xa7, 0x20, 0x71, 0xbb, 0xe6, 0xeb, 0xbc,
+	0x55, 0x27, 0x20, 0x71, 0x6b, 0x96, 0xb4, 0xb4, 0xc0, 0x31, 0x5b, 0x7e, 0x88, 0xfb, 0x55, 0x00,
+	0x39, 0x2d, 0x05, 0x9d, 0x41, 0x2d, 0x3d, 0xd3, 0xc4, 0x10, 0x5a, 0x95, 0x76, 0xfd, 0xf4, 0x59,
+	0x79, 0xed, 0xa9, 0x09, 0x52, 0x91, 0x9a, 0xcc, 0xc7, 0x89, 0x17, 0xfb, 0x11, 0xf1, 0xc3, 0x80,
+	0x9d, 0xfd, 0xe6, 0x97, 0x60, 0x3e, 0x66, 0xa2, 0x53, 0x90, 0xbd, 0x30, 0x20, 0x71, 0x38, 0x65,
+	0xee, 0xdd, 0x98, 0xa8, 0xc7, 0x21, 0xd6, 0xa8, 0x97, 0x50, 0x5f, 0xcd, 0xbb, 0x83, 0x01, 0x5f,
+	0x80, 0x9c, 0x25, 0x3c, 0x00, 0x25, 0xad, 0x72, 0xcc, 0x7f, 0x8c, 0x6a, 0xc5, 0x46, 0xfc, 0x2d,
+	0x40, 0x7d, 0x25, 0x1d, 0x7a, 0x05, 0x92, 0xff, 0x48, 0x9f, 0x14, 0xde, 0x89, 0x93, 0xad, 0x05,
+	0xf6, 0x5f, 0xbb, 0x0b, 0x9c, 0xcb, 0x7e, 0x71, 0x03, 0x92, 0xf6, 0xe1, 0x03, 0xb2, 0x1f, 0xdd,
+	0x80, 0x64, 0x32, 0xfe, 0x28, 0x55, 0x76, 0x90, 0x31, 0x03, 0x64, 0x32, 0xfe, 0x3e, 0x89, 0x3b,
+	0xc8, 0x98, 0x1f, 0x58, 0x2b, 0x5f, 0x81, 0xfe, 0x5e, 0xe1, 0xeb, 0xfe, 0x43, 0x08, 0x20, 0x6f,
+	0x2f, 0xef, 0xa7, 0xda, 0x3c, 0x59, 0xca, 0xf2, 0xc2, 0xd7, 0x39, 0x81, 0x71, 0xcf, 0x72, 0x6e,
+	0x59, 0x69, 0xc1, 0xde, 0x2f, 0x73, 0x24, 0xaf, 0xaa, 0x58, 0x01, 0x7d, 0x23, 0x30, 0x8e, 0xd3,
+	0xe4, 0xc7, 0x7f, 0x08, 0x20, 0xb2, 0x3f, 0x0a, 0x1f, 0xc3, 0xbe, 0x7d, 0x77, 0x3e, 0xe8, 0x0f,
+	0x5f, 0x3f, 0x5c, 0x5b, 0xc3, 0x61, 0xf7, 0xd2, 0xd2, 0x3f, 0x42, 0x08, 0x34, 0xc7, 0xba, 0xb2,
+	0x7a, 0xa3, 0x7c, 0x4d, 0x40, 0x87, 0x70, 0x60, 0xde, 0xd9, 0x83, 0x7e, 0xaf, 0x3b, 0xb2, 0xf2,
+	0xe5, 0x3d, 0xaa, 0x37, 0xad, 0x41, 0xff, 0xde, 0x72, 0xf2, 0xc5, 0x0a, 0x52, 0xa1, 0xd6, 0x35,
+	0xcd, 0x07, 0xdb, 0xb2, 0x1c, 0x5d, 0x44, 0xfb, 0x50, 0x77, 0xac, 0xeb, 0xdb, 0x7b, 0x8b, 0x2f,
+	0x48, 0xf4, 0xb3, 0x63, 0xf5, 0xee, 0x1f, 0x1c, 0xbb, 0xa7, 0x57, 0xe9, 0x6c, 0x68, 0xdd, 0x98,
+	0x6c, 0x26, 0xd3, 0x99, 0xe9, 0xdc, 0xda, 0x6c, 0x56, 0x43, 0x35, 0x10, 0xaf, 0x6e, 0xfb, 0x37,
+	0xba, 0x82, 0x14, 0x90, 0x06, 0x56, 0xf7, 0xde, 0xd2, 0x81, 0x0e, 0x2f, 0x9d, 0xee, 0xc5, 0x48,
+	0xaf, 0xd3, 0xa1, 0xed, 0xdc, 0xdd, 0x58, 0xba, 0x7a, 0xfc, 0x0d, 0xec, 0x2f, 0x0f, 0xe9, 0xdc,
+	0x25, 0xde, 0x23, 0x7a, 0x0e, 0xd2, 0x98, 0x0e, 0x52, 0xd3, 0x1d, 0x96, 0x9e, 0xe7, 0xb9, 0xfa,
+	0xfb, 0xd3, 0x91, 0xf0, 0xe7, 0xd3, 0x91, 0xf0, 0xd7, 0xd3, 0x91, 0xf0, 0x4f, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0x99, 0xba, 0xca, 0x75, 0x8a, 0x09, 0x00, 0x00,
 }
 
 func (m *TraceEvent) Marshal() (dAtA []byte, err error) {
@@ -1578,9 +1596,9 @@ func (m *TraceEvent) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x22
 		i++
 		i = encodeVarintTrace(dAtA, i, uint64(m.PublishMessage.Size()))
-		n1, err1 := m.PublishMessage.MarshalTo(dAtA[i:])
-		if err1 != nil {
-			return 0, err1
+		n1, err := m.PublishMessage.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
 		}
 		i += n1
 	}
@@ -1588,9 +1606,9 @@ func (m *TraceEvent) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x2a
 		i++
 		i = encodeVarintTrace(dAtA, i, uint64(m.RejectMessage.Size()))
-		n2, err2 := m.RejectMessage.MarshalTo(dAtA[i:])
-		if err2 != nil {
-			return 0, err2
+		n2, err := m.RejectMessage.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
 		}
 		i += n2
 	}
@@ -1598,9 +1616,9 @@ func (m *TraceEvent) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x32
 		i++
 		i = encodeVarintTrace(dAtA, i, uint64(m.DuplicateMessage.Size()))
-		n3, err3 := m.DuplicateMessage.MarshalTo(dAtA[i:])
-		if err3 != nil {
-			return 0, err3
+		n3, err := m.DuplicateMessage.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
 		}
 		i += n3
 	}
@@ -1608,9 +1626,9 @@ func (m *TraceEvent) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x3a
 		i++
 		i = encodeVarintTrace(dAtA, i, uint64(m.DeliverMessage.Size()))
-		n4, err4 := m.DeliverMessage.MarshalTo(dAtA[i:])
-		if err4 != nil {
-			return 0, err4
+		n4, err := m.DeliverMessage.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
 		}
 		i += n4
 	}
@@ -1618,9 +1636,9 @@ func (m *TraceEvent) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x42
 		i++
 		i = encodeVarintTrace(dAtA, i, uint64(m.AddPeer.Size()))
-		n5, err5 := m.AddPeer.MarshalTo(dAtA[i:])
-		if err5 != nil {
-			return 0, err5
+		n5, err := m.AddPeer.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
 		}
 		i += n5
 	}
@@ -1628,9 +1646,9 @@ func (m *TraceEvent) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x4a
 		i++
 		i = encodeVarintTrace(dAtA, i, uint64(m.RemovePeer.Size()))
-		n6, err6 := m.RemovePeer.MarshalTo(dAtA[i:])
-		if err6 != nil {
-			return 0, err6
+		n6, err := m.RemovePeer.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
 		}
 		i += n6
 	}
@@ -1638,9 +1656,9 @@ func (m *TraceEvent) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x52
 		i++
 		i = encodeVarintTrace(dAtA, i, uint64(m.RecvRPC.Size()))
-		n7, err7 := m.RecvRPC.MarshalTo(dAtA[i:])
-		if err7 != nil {
-			return 0, err7
+		n7, err := m.RecvRPC.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
 		}
 		i += n7
 	}
@@ -1648,9 +1666,9 @@ func (m *TraceEvent) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x5a
 		i++
 		i = encodeVarintTrace(dAtA, i, uint64(m.SendRPC.Size()))
-		n8, err8 := m.SendRPC.MarshalTo(dAtA[i:])
-		if err8 != nil {
-			return 0, err8
+		n8, err := m.SendRPC.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
 		}
 		i += n8
 	}
@@ -1658,9 +1676,9 @@ func (m *TraceEvent) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x62
 		i++
 		i = encodeVarintTrace(dAtA, i, uint64(m.DropRPC.Size()))
-		n9, err9 := m.DropRPC.MarshalTo(dAtA[i:])
-		if err9 != nil {
-			return 0, err9
+		n9, err := m.DropRPC.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
 		}
 		i += n9
 	}
@@ -1668,9 +1686,9 @@ func (m *TraceEvent) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x6a
 		i++
 		i = encodeVarintTrace(dAtA, i, uint64(m.Join.Size()))
-		n10, err10 := m.Join.MarshalTo(dAtA[i:])
-		if err10 != nil {
-			return 0, err10
+		n10, err := m.Join.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
 		}
 		i += n10
 	}
@@ -1678,9 +1696,9 @@ func (m *TraceEvent) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x72
 		i++
 		i = encodeVarintTrace(dAtA, i, uint64(m.Leave.Size()))
-		n11, err11 := m.Leave.MarshalTo(dAtA[i:])
-		if err11 != nil {
-			return 0, err11
+		n11, err := m.Leave.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
 		}
 		i += n11
 	}
@@ -1688,9 +1706,9 @@ func (m *TraceEvent) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x7a
 		i++
 		i = encodeVarintTrace(dAtA, i, uint64(m.Graft.Size()))
-		n12, err12 := m.Graft.MarshalTo(dAtA[i:])
-		if err12 != nil {
-			return 0, err12
+		n12, err := m.Graft.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
 		}
 		i += n12
 	}
@@ -1700,9 +1718,9 @@ func (m *TraceEvent) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x1
 		i++
 		i = encodeVarintTrace(dAtA, i, uint64(m.Prune.Size()))
-		n13, err13 := m.Prune.MarshalTo(dAtA[i:])
-		if err13 != nil {
-			return 0, err13
+		n13, err := m.Prune.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
 		}
 		i += n13
 	}
@@ -1787,6 +1805,21 @@ func (m *TraceEvent_RejectMessage) MarshalTo(dAtA []byte) (int, error) {
 		i = encodeVarintTrace(dAtA, i, uint64(len(*m.Reason)))
 		i += copy(dAtA[i:], *m.Reason)
 	}
+	if len(m.Topics) > 0 {
+		for _, s := range m.Topics {
+			dAtA[i] = 0x22
+			i++
+			l = len(s)
+			for l >= 1<<7 {
+				dAtA[i] = uint8(uint64(l)&0x7f | 0x80)
+				l >>= 7
+				i++
+			}
+			dAtA[i] = uint8(l)
+			i++
+			i += copy(dAtA[i:], s)
+		}
+	}
 	if m.XXX_unrecognized != nil {
 		i += copy(dAtA[i:], m.XXX_unrecognized)
 	}
@@ -1820,6 +1853,21 @@ func (m *TraceEvent_DuplicateMessage) MarshalTo(dAtA []byte) (int, error) {
 		i = encodeVarintTrace(dAtA, i, uint64(len(m.ReceivedFrom)))
 		i += copy(dAtA[i:], m.ReceivedFrom)
 	}
+	if len(m.Topics) > 0 {
+		for _, s := range m.Topics {
+			dAtA[i] = 0x1a
+			i++
+			l = len(s)
+			for l >= 1<<7 {
+				dAtA[i] = uint8(uint64(l)&0x7f | 0x80)
+				l >>= 7
+				i++
+			}
+			dAtA[i] = uint8(l)
+			i++
+			i += copy(dAtA[i:], s)
+		}
+	}
 	if m.XXX_unrecognized != nil {
 		i += copy(dAtA[i:], m.XXX_unrecognized)
 	}
@@ -1847,6 +1895,21 @@ func (m *TraceEvent_DeliverMessage) MarshalTo(dAtA []byte) (int, error) {
 		i = encodeVarintTrace(dAtA, i, uint64(len(m.MessageID)))
 		i += copy(dAtA[i:], m.MessageID)
 	}
+	if len(m.Topics) > 0 {
+		for _, s := range m.Topics {
+			dAtA[i] = 0x12
+			i++
+			l = len(s)
+			for l >= 1<<7 {
+				dAtA[i] = uint8(uint64(l)&0x7f | 0x80)
+				l >>= 7
+				i++
+			}
+			dAtA[i] = uint8(l)
+			i++
+			i += copy(dAtA[i:], s)
+		}
+	}
 	if m.XXX_unrecognized != nil {
 		i += copy(dAtA[i:], m.XXX_unrecognized)
 	}
@@ -1938,9 +2001,9 @@ func (m *TraceEvent_RecvRPC) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x12
 		i++
 		i = encodeVarintTrace(dAtA, i, uint64(m.Meta.Size()))
-		n14, err14 := m.Meta.MarshalTo(dAtA[i:])
-		if err14 != nil {
-			return 0, err14
+		n14, err := m.Meta.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
 		}
 		i += n14
 	}
@@ -1975,9 +2038,9 @@ func (m *TraceEvent_SendRPC) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x12
 		i++
 		i = encodeVarintTrace(dAtA, i, uint64(m.Meta.Size()))
-		n15, err15 := m.Meta.MarshalTo(dAtA[i:])
-		if err15 != nil {
-			return 0, err15
+		n15, err := m.Meta.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
 		}
 		i += n15
 	}
@@ -2012,9 +2075,9 @@ func (m *TraceEvent_DropRPC) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x12
 		i++
 		i = encodeVarintTrace(dAtA, i, uint64(m.Meta.Size()))
-		n16, err16 := m.Meta.MarshalTo(dAtA[i:])
-		if err16 != nil {
-			return 0, err16
+		n16, err := m.Meta.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
 		}
 		i += n16
 	}
@@ -2187,9 +2250,9 @@ func (m *TraceEvent_RPCMeta) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x1a
 		i++
 		i = encodeVarintTrace(dAtA, i, uint64(m.Control.Size()))
-		n17, err17 := m.Control.MarshalTo(dAtA[i:])
-		if err17 != nil {
-			return 0, err17
+		n17, err := m.Control.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
 		}
 		i += n17
 	}
@@ -2629,6 +2692,12 @@ func (m *TraceEvent_RejectMessage) Size() (n int) {
 		l = len(*m.Reason)
 		n += 1 + l + sovTrace(uint64(l))
 	}
+	if len(m.Topics) > 0 {
+		for _, s := range m.Topics {
+			l = len(s)
+			n += 1 + l + sovTrace(uint64(l))
+		}
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -2649,6 +2718,12 @@ func (m *TraceEvent_DuplicateMessage) Size() (n int) {
 		l = len(m.ReceivedFrom)
 		n += 1 + l + sovTrace(uint64(l))
 	}
+	if len(m.Topics) > 0 {
+		for _, s := range m.Topics {
+			l = len(s)
+			n += 1 + l + sovTrace(uint64(l))
+		}
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -2665,6 +2740,12 @@ func (m *TraceEvent_DeliverMessage) Size() (n int) {
 		l = len(m.MessageID)
 		n += 1 + l + sovTrace(uint64(l))
 	}
+	if len(m.Topics) > 0 {
+		for _, s := range m.Topics {
+			l = len(s)
+			n += 1 + l + sovTrace(uint64(l))
+		}
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -3899,6 +3980,38 @@ func (m *TraceEvent_RejectMessage) Unmarshal(dAtA []byte) error {
 			s := string(dAtA[iNdEx:postIndex])
 			m.Reason = &s
 			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Topics", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTrace
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTrace
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTrace
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Topics = append(m.Topics, string(dAtA[iNdEx:postIndex]))
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipTrace(dAtA[iNdEx:])
@@ -4021,6 +4134,38 @@ func (m *TraceEvent_DuplicateMessage) Unmarshal(dAtA []byte) error {
 				m.ReceivedFrom = []byte{}
 			}
 			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Topics", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTrace
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTrace
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTrace
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Topics = append(m.Topics, string(dAtA[iNdEx:postIndex]))
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipTrace(dAtA[iNdEx:])
@@ -4109,6 +4254,38 @@ func (m *TraceEvent_DeliverMessage) Unmarshal(dAtA []byte) error {
 				m.MessageID = []byte{}
 			}
 			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Topics", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTrace
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTrace
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTrace
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Topics = append(m.Topics, string(dAtA[iNdEx:postIndex]))
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipTrace(dAtA[iNdEx:])
diff --git a/pb/trace.proto b/pb/trace.proto
index d83939e38ed88801d1877ff6bde7844882cc14a0..397f3c8d27aaea4d1ba11c997ea7335710b3e3bf 100644
--- a/pb/trace.proto
+++ b/pb/trace.proto
@@ -46,15 +46,18 @@ message TraceEvent {
     optional bytes messageID = 1;
     optional bytes receivedFrom = 2;
     optional string reason = 3;
+    repeated string topics = 4;
   }
 
   message DuplicateMessage {
     optional bytes messageID = 1;
     optional bytes receivedFrom = 2;
+    repeated string topics = 3;
   }
 
   message DeliverMessage {
     optional bytes messageID = 1;
+    repeated string topics = 2;
   }
 
   message AddPeer {