diff --git a/crypto/crypto.go b/crypto/crypto.go
index 84c023d..d1186e7 100644
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@@ -155,4 +155,3 @@ func GetPubKeyFromPeerId(pid string) (ic.PubKey, error) {
 	}
 	return pubKey, nil
 }
-
diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go
index b09e4ff..e34fbac 100644
--- a/crypto/crypto_test.go
+++ b/crypto/crypto_test.go
@@ -7,7 +7,7 @@ import (
 )
 
 const (
-	KeyString = "CAISIJFNZZd5ZSvi9OlJP/mz/vvUobvlrr2//QN4DzX/EShP"
+	KeyString  = "CAISIJFNZZd5ZSvi9OlJP/mz/vvUobvlrr2//QN4DzX/EShP"
 	EncryptKey = "Tron2theMoon1234"
 )
 
diff --git a/protos/hub/hub.pb.go b/protos/hub/hub.pb.go
index 02006bf..874413f 100644
--- a/protos/hub/hub.pb.go
+++ b/protos/hub/hub.pb.go
@@ -825,73 +825,74 @@ func init() { proto.RegisterFile("protos/hub/hub.proto", fileDescriptor_c704b599
 func init() { golang_proto.RegisterFile("protos/hub/hub.proto", fileDescriptor_c704b5990190a69f) }
 
 var fileDescriptor_c704b5990190a69f = []byte{
-	// 1053 bytes of a gzipped FileDescriptorProto
+	// 1061 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4d, 0x4f, 0x23, 0x47,
 	0x10, 0xdd, 0x36, 0x06, 0xec, 0xf2, 0x77, 0x2f, 0xcb, 0xce, 0x7a, 0x25, 0xe3, 0x58, 0x59, 0xc5,
-	0xbb, 0xd9, 0x98, 0x88, 0x48, 0x1b, 0x29, 0x37, 0x0c, 0x0e, 0x20, 0x41, 0x20, 0x6d, 0xe0, 0x90,
-	0xcb, 0xa8, 0xed, 0x69, 0xcc, 0x08, 0x7b, 0x7a, 0x76, 0xba, 0x87, 0x55, 0xf6, 0x57, 0xe4, 0x98,
-	0x9f, 0x93, 0x23, 0xc7, 0x28, 0x52, 0xae, 0x49, 0x04, 0x97, 0x9c, 0xf2, 0x1b, 0xa2, 0xea, 0xf9,
-	0xb0, 0x0d, 0x8e, 0x94, 0x8d, 0x72, 0x40, 0xea, 0x7a, 0xf5, 0xaa, 0xfc, 0xaa, 0xbb, 0xe7, 0x35,
-	0xb0, 0xe6, 0x07, 0x52, 0x4b, 0xb5, 0x79, 0x19, 0x0e, 0xf0, 0xaf, 0x63, 0x42, 0xba, 0x74, 0x19,
-	0x0e, 0xea, 0x9f, 0x8f, 0x5c, 0x8d, 0xd0, 0x50, 0x4e, 0x36, 0x75, 0x20, 0xbd, 0xcf, 0x42, 0xb5,
-	0x69, 0xd2, 0x83, 0xf0, 0x62, 0x73, 0x24, 0x47, 0xd2, 0x04, 0x66, 0x15, 0x95, 0xd5, 0x37, 0x46,
-	0x52, 0x8e, 0xc6, 0x62, 0xca, 0xd2, 0xee, 0x44, 0x28, 0xcd, 0x27, 0x7e, 0x44, 0x68, 0x7d, 0x05,
-	0x85, 0xbe, 0xd0, 0xda, 0xf5, 0x46, 0x8a, 0x89, 0xb7, 0xb4, 0x0c, 0x19, 0xd7, 0xb1, 0x48, 0x93,
-	0xb4, 0xf3, 0x2c, 0xe3, 0x3a, 0xf4, 0x39, 0xe4, 0x03, 0xa1, 0x7c, 0x5b, 0xb9, 0xef, 0x85, 0x95,
-	0x69, 0x92, 0xf6, 0x32, 0xcb, 0x21, 0xd0, 0x77, 0xdf, 0x8b, 0xd6, 0x2f, 0x04, 0x8a, 0xd3, 0x62,
-	0xe5, 0xd3, 0x17, 0x90, 0x1d, 0x4a, 0x47, 0x98, 0xfa, 0xf2, 0x56, 0xad, 0x83, 0x5a, 0x31, 0x21,
-	0x3d, 0x25, 0x76, 0xa4, 0x23, 0x98, 0x49, 0x53, 0x0b, 0x56, 0x27, 0x42, 0x29, 0x3e, 0x8a, 0x5a,
-	0xe6, 0x59, 0x12, 0xd2, 0x03, 0x28, 0x05, 0x31, 0xdf, 0x46, 0xa5, 0xd6, 0x52, 0x93, 0xb4, 0x0b,
-	0x5b, 0xf5, 0x4e, 0x34, 0x46, 0x27, 0x19, 0xa3, 0x73, 0x9a, 0x8c, 0xd1, 0xcd, 0xdd, 0xfc, 0xb6,
-	0xf1, 0xe8, 0x87, 0xdf, 0x37, 0x08, 0x2b, 0x26, 0xa5, 0x98, 0xa4, 0x6f, 0xa0, 0xa4, 0x62, 0x6d,
-	0xb6, 0xc3, 0x35, 0xb7, 0xb2, 0xa6, 0x55, 0x24, 0x2a, 0x51, 0xbd, 0xcb, 0x35, 0x67, 0x45, 0x35,
-	0x13, 0xb5, 0xfe, 0x9c, 0x19, 0x0a, 0x01, 0xfa, 0x0a, 0x6a, 0x4a, 0xcb, 0x80, 0x8f, 0x84, 0xed,
-	0x07, 0xee, 0x50, 0xd8, 0x5c, 0x5d, 0x99, 0x09, 0x09, 0xab, 0xc4, 0x89, 0x13, 0xc4, 0xb7, 0xd5,
-	0x15, 0xed, 0xc0, 0xe3, 0x01, 0xf7, 0x9c, 0x77, 0xae, 0xa3, 0x2f, 0x67, 0xd8, 0x19, 0xc3, 0xae,
-	0xa5, 0xa9, 0x94, 0xdf, 0x86, 0x6a, 0xd2, 0x1b, 0xc7, 0xb5, 0x27, 0xae, 0x67, 0x46, 0x26, 0xac,
-	0x1c, 0xe3, 0x38, 0xcb, 0x91, 0xeb, 0xd1, 0x4f, 0xa0, 0x32, 0xed, 0x3c, 0x76, 0x27, 0xae, 0x36,
-	0x03, 0x11, 0x56, 0x4e, 0xe1, 0x43, 0x44, 0xe9, 0x4b, 0xa8, 0x0e, 0xe5, 0x78, 0xcc, 0xb5, 0x08,
-	0xf8, 0xd8, 0x56, 0x9a, 0x5f, 0x09, 0x6b, 0x39, 0x52, 0x3b, 0xc5, 0xfb, 0x08, 0xb7, 0xbe, 0x84,
-	0xdc, 0xbe, 0x54, 0xfa, 0xc3, 0x0f, 0xfe, 0x2f, 0x02, 0xf9, 0xb8, 0xf2, 0xff, 0x38, 0xf5, 0x8f,
-	0x61, 0xf9, 0x12, 0xbb, 0xc5, 0xa7, 0x5d, 0x36, 0x1d, 0x4c, 0x7f, 0x73, 0x3e, 0x51, 0x72, 0x5e,
-	0x51, 0x76, 0x5e, 0x11, 0xa5, 0x90, 0x9d, 0xa0, 0x86, 0x65, 0xd3, 0xd9, 0xac, 0x1f, 0x5e, 0xa6,
-	0x95, 0xff, 0x7a, 0x99, 0x5a, 0xaf, 0xe3, 0x79, 0xcd, 0x85, 0xd8, 0x48, 0xe4, 0x92, 0xe6, 0x52,
-	0xbb, 0xb0, 0x95, 0x4f, 0xe5, 0xc6, 0x4a, 0x5b, 0xbf, 0xe6, 0x20, 0x8b, 0x31, 0x7d, 0x0a, 0xab,
-	0x9e, 0x74, 0x84, 0x9d, 0xee, 0xec, 0x0a, 0x86, 0x07, 0x0e, 0x3d, 0x86, 0xea, 0x30, 0x10, 0x5c,
-	0x47, 0xc2, 0xcc, 0x6f, 0x9b, 0x4d, 0xf9, 0xb7, 0xea, 0x2a, 0x51, 0x75, 0x9a, 0xc2, 0x86, 0xa1,
-	0xef, 0xcc, 0x37, 0xfc, 0x90, 0x6f, 0xa7, 0x12, 0x55, 0x4f, 0x1b, 0xa6, 0xd2, 0x7d, 0xb3, 0xd7,
-	0x89, 0x74, 0x9f, 0xae, 0xc3, 0x4a, 0x20, 0x46, 0xae, 0xf4, 0xe2, 0xbd, 0x8e, 0x23, 0xfa, 0x11,
-	0x14, 0x07, 0xfa, 0x42, 0xd9, 0xd7, 0x22, 0x50, 0x98, 0x5d, 0x31, 0xd9, 0x02, 0x62, 0xe7, 0x11,
-	0x44, 0xd7, 0x60, 0x59, 0x0d, 0x65, 0x20, 0xac, 0xd5, 0x26, 0x69, 0x67, 0x58, 0x14, 0xd0, 0x0d,
-	0x28, 0x5c, 0x0a, 0x1e, 0x68, 0x7b, 0x20, 0xb8, 0x56, 0x56, 0xae, 0x49, 0xda, 0x4b, 0x0c, 0x0c,
-	0xd4, 0x45, 0x04, 0x7f, 0x31, 0xf4, 0xcd, 0x01, 0xe6, 0x4d, 0x5d, 0x1c, 0xd1, 0x2a, 0x2c, 0xe1,
-	0x65, 0x02, 0x53, 0x80, 0x4b, 0xda, 0x00, 0x08, 0x84, 0x1f, 0x6a, 0xae, 0x51, 0x41, 0xc1, 0xb0,
-	0x67, 0x10, 0xfa, 0x02, 0xca, 0xa1, 0x3f, 0x96, 0xdc, 0xb1, 0xf9, 0xb5, 0xc0, 0xaf, 0xcb, 0x2a,
-	0x1a, 0x4e, 0x29, 0x42, 0xb7, 0x23, 0x10, 0xbf, 0xb5, 0x98, 0x76, 0xcd, 0x03, 0x97, 0x7b, 0x43,
-	0x61, 0x95, 0x0c, 0x2f, 0xae, 0x3e, 0x8f, 0x51, 0xfc, 0xd6, 0x1c, 0xf9, 0xce, 0x9b, 0xeb, 0x58,
-	0x36, 0xcc, 0x4a, 0x82, 0x27, 0x3d, 0x3f, 0x85, 0x5a, 0x4a, 0x4d, 0xbb, 0x56, 0x0c, 0x37, 0xed,
-	0x91, 0xf6, 0xdd, 0x84, 0xdc, 0x58, 0x0e, 0xa3, 0x29, 0xaa, 0xe6, 0x14, 0x4b, 0xe6, 0x92, 0x1d,
-	0xc6, 0x60, 0x37, 0x8b, 0x07, 0xc7, 0x52, 0x12, 0x7d, 0x0d, 0x34, 0xf1, 0x91, 0x6b, 0x39, 0x0e,
-	0x27, 0xc2, 0x1e, 0x72, 0xdf, 0xaa, 0x45, 0xed, 0xe3, 0xcc, 0xb9, 0x49, 0xec, 0x70, 0x1f, 0x5d,
-	0xea, 0x1e, 0x7b, 0x2c, 0x2e, 0xb4, 0x45, 0x0d, 0xbd, 0x36, 0x47, 0x3f, 0x14, 0x17, 0x7a, 0xa1,
-	0x4b, 0x3d, 0x6e, 0x92, 0x76, 0xf6, 0x81, 0x4b, 0x2d, 0xf4, 0xca, 0xb5, 0x68, 0x47, 0xee, 0x7b,
-	0xe5, 0x03, 0xae, 0x50, 0xda, 0x7a, 0xf2, 0x90, 0xdb, 0x53, 0x7a, 0x91, 0xfb, 0xad, 0x2f, 0x74,
-	0xbf, 0x7f, 0x30, 0xe0, 0xa7, 0xd1, 0x68, 0x0f, 0x0d, 0x78, 0x01, 0x1f, 0x65, 0x58, 0x8b, 0xf8,
-	0x28, 0x64, 0x91, 0xbb, 0x3e, 0x33, 0x5b, 0x71, 0xdf, 0x5d, 0x51, 0xf3, 0x0c, 0x75, 0x2c, 0x95,
-	0xb6, 0xea, 0xd1, 0xa6, 0x4d, 0xe1, 0x43, 0x19, 0x0d, 0x37, 0x43, 0x1c, 0x84, 0x81, 0x67, 0x3d,
-	0xbf, 0x4f, 0xec, 0x86, 0x81, 0xd7, 0xea, 0x40, 0x2e, 0xb9, 0x01, 0x78, 0xf9, 0xc7, 0x5c, 0xc7,
-	0xef, 0x10, 0x2e, 0x0d, 0x22, 0xbd, 0xf8, 0xad, 0xc1, 0xe5, 0xab, 0x21, 0x14, 0x67, 0x7d, 0x98,
-	0x16, 0x60, 0xb5, 0x7f, 0xb6, 0xb3, 0xd3, 0xeb, 0xf7, 0xab, 0x8f, 0x68, 0x1d, 0xd6, 0xfb, 0x07,
-	0x7b, 0xdf, 0x6c, 0x9f, 0x9e, 0xb1, 0x9e, 0xfd, 0xf5, 0x31, 0x3b, 0xda, 0x3e, 0xb5, 0x7b, 0x8c,
-	0x1d, 0xb3, 0x2a, 0xa1, 0xcf, 0xe0, 0xc9, 0xce, 0xf1, 0xd1, 0xc9, 0xd9, 0x69, 0xcf, 0xde, 0xde,
-	0xdd, 0x65, 0xbd, 0x7e, 0x3f, 0x4e, 0x65, 0x68, 0x05, 0x0a, 0xc7, 0xa7, 0xfb, 0x3d, 0x16, 0x03,
-	0x6b, 0x5b, 0x2e, 0xe4, 0xf6, 0xc3, 0xc1, 0xb7, 0xa1, 0x08, 0xbe, 0xa7, 0x5b, 0x50, 0xd8, 0x13,
-	0x3a, 0x79, 0x3d, 0x69, 0x75, 0xee, 0xad, 0x65, 0xe2, 0x6d, 0xbd, 0x76, 0x0f, 0x51, 0x3e, 0x7d,
-	0x09, 0xb9, 0x3d, 0xa1, 0x8d, 0xbb, 0xd2, 0xd2, 0xd4, 0xf9, 0x91, 0x5d, 0x9e, 0x0d, 0x95, 0xdf,
-	0x7d, 0x73, 0x73, 0xdb, 0x20, 0x3f, 0xdf, 0x36, 0xc8, 0x1f, 0xb7, 0x0d, 0xf2, 0xe3, 0x5d, 0x83,
-	0xfc, 0x74, 0xd7, 0x20, 0x37, 0x77, 0x0d, 0x02, 0x05, 0x57, 0x76, 0xd0, 0x69, 0xb0, 0xa0, 0x8b,
-	0x7a, 0x4e, 0xd0, 0xec, 0x4e, 0xc8, 0x77, 0xf8, 0x6f, 0xd3, 0x60, 0xc5, 0x58, 0xdf, 0x17, 0x7f,
-	0x07, 0x00, 0x00, 0xff, 0xff, 0x16, 0x90, 0xc4, 0xd2, 0x5a, 0x09, 0x00, 0x00,
+	0xbb, 0xd9, 0x98, 0x88, 0x48, 0x1b, 0x29, 0x37, 0x0c, 0x0e, 0x20, 0x41, 0x20, 0x63, 0xe0, 0x90,
+	0xcb, 0xa8, 0x3d, 0xd3, 0x98, 0x11, 0xe3, 0xe9, 0xd9, 0xe9, 0x1e, 0x56, 0xd9, 0x5f, 0x91, 0x63,
+	0x7e, 0x4e, 0x8e, 0x1c, 0xa3, 0x48, 0xb9, 0x26, 0x11, 0x5c, 0x72, 0xca, 0x6f, 0x88, 0xaa, 0xe7,
+	0xc3, 0x36, 0x38, 0x52, 0x36, 0xca, 0x01, 0xa9, 0xeb, 0xd5, 0xab, 0xf2, 0xab, 0xee, 0x9e, 0xd7,
+	0xc0, 0x5a, 0x10, 0x0a, 0x25, 0xe4, 0xe6, 0x65, 0x34, 0xc2, 0xbf, 0x9e, 0x0e, 0xe9, 0xd2, 0x65,
+	0x34, 0x6a, 0x7e, 0x3e, 0x76, 0x15, 0x42, 0xb6, 0x98, 0x6c, 0xaa, 0x50, 0xf8, 0x9f, 0x45, 0x72,
+	0x53, 0xa7, 0x47, 0xd1, 0xc5, 0xe6, 0x58, 0x8c, 0x85, 0x0e, 0xf4, 0x2a, 0x2e, 0x6b, 0x6e, 0x8c,
+	0x85, 0x18, 0x7b, 0x7c, 0xca, 0x52, 0xee, 0x84, 0x4b, 0xc5, 0x26, 0x41, 0x4c, 0xe8, 0x7c, 0x05,
+	0xa5, 0x21, 0x57, 0xca, 0xf5, 0xc7, 0xd2, 0xe4, 0x6f, 0x69, 0x15, 0x72, 0xae, 0x63, 0x90, 0x36,
+	0xe9, 0x16, 0xcd, 0x9c, 0xeb, 0xd0, 0xe7, 0x50, 0x0c, 0xb9, 0x0c, 0x2c, 0xe9, 0xbe, 0xe7, 0x46,
+	0xae, 0x4d, 0xba, 0xcb, 0x66, 0x01, 0x81, 0xa1, 0xfb, 0x9e, 0x77, 0x7e, 0x21, 0x50, 0x9e, 0x16,
+	0xcb, 0x80, 0xbe, 0x80, 0xbc, 0x2d, 0x1c, 0xae, 0xeb, 0xab, 0x5b, 0x8d, 0x1e, 0x6a, 0xc5, 0x84,
+	0xf0, 0x25, 0xdf, 0x11, 0x0e, 0x37, 0x75, 0x9a, 0x1a, 0xb0, 0x3a, 0xe1, 0x52, 0xb2, 0x71, 0xdc,
+	0xb2, 0x68, 0xa6, 0x21, 0x3d, 0x80, 0x4a, 0x98, 0xf0, 0x2d, 0x54, 0x6a, 0x2c, 0xb5, 0x49, 0xb7,
+	0xb4, 0xd5, 0xec, 0xc5, 0x63, 0xf4, 0xd2, 0x31, 0x7a, 0xa7, 0xe9, 0x18, 0xfd, 0xc2, 0xcd, 0x6f,
+	0x1b, 0x8f, 0x7e, 0xf8, 0x7d, 0x83, 0x98, 0xe5, 0xb4, 0x14, 0x93, 0xf4, 0x0d, 0x54, 0x64, 0xa2,
+	0xcd, 0x72, 0x98, 0x62, 0x46, 0x5e, 0xb7, 0x8a, 0x45, 0xa5, 0xaa, 0x77, 0x99, 0x62, 0x66, 0x59,
+	0xce, 0x44, 0x9d, 0x3f, 0x67, 0x86, 0x42, 0x80, 0xbe, 0x82, 0x86, 0x54, 0x22, 0x64, 0x63, 0x6e,
+	0x05, 0xa1, 0x6b, 0x73, 0x8b, 0xc9, 0x2b, 0x3d, 0x21, 0x31, 0x6b, 0x49, 0xe2, 0x04, 0xf1, 0x6d,
+	0x79, 0x45, 0x7b, 0xf0, 0x78, 0xc4, 0x7c, 0xe7, 0x9d, 0xeb, 0xa8, 0xcb, 0x19, 0x76, 0x4e, 0xb3,
+	0x1b, 0x59, 0x2a, 0xe3, 0x77, 0xa1, 0x9e, 0xf6, 0xc6, 0x71, 0xad, 0x89, 0xeb, 0xeb, 0x91, 0x89,
+	0x59, 0x4d, 0x70, 0x9c, 0xe5, 0xc8, 0xf5, 0xe9, 0x27, 0x50, 0x9b, 0x76, 0xf6, 0xdc, 0x89, 0xab,
+	0xf4, 0x40, 0xc4, 0xac, 0x66, 0xf0, 0x21, 0xa2, 0xf4, 0x25, 0xd4, 0x6d, 0xe1, 0x79, 0x4c, 0xf1,
+	0x90, 0x79, 0x96, 0x54, 0xec, 0x8a, 0x1b, 0xcb, 0xb1, 0xda, 0x29, 0x3e, 0x44, 0xb8, 0xf3, 0x25,
+	0x14, 0xf6, 0x85, 0x54, 0x1f, 0x7e, 0xf0, 0x7f, 0x11, 0x28, 0x26, 0x95, 0xff, 0xc7, 0xa9, 0x7f,
+	0x0c, 0xcb, 0x97, 0xd8, 0x2d, 0x39, 0xed, 0xaa, 0xee, 0xa0, 0xfb, 0xeb, 0xf3, 0x89, 0x93, 0xf3,
+	0x8a, 0xf2, 0xf3, 0x8a, 0x28, 0x85, 0xfc, 0x04, 0x35, 0x2c, 0xeb, 0xce, 0x7a, 0xfd, 0xf0, 0x32,
+	0xad, 0xfc, 0xd7, 0xcb, 0xd4, 0x79, 0x9d, 0xcc, 0xab, 0x2f, 0xc4, 0x46, 0x2a, 0x97, 0xb4, 0x97,
+	0xba, 0xa5, 0xad, 0x62, 0x26, 0x37, 0x51, 0xda, 0xf9, 0xb5, 0x00, 0x79, 0x8c, 0xe9, 0x53, 0x58,
+	0xf5, 0x85, 0xc3, 0xad, 0x6c, 0x67, 0x57, 0x30, 0x3c, 0x70, 0xe8, 0x31, 0xd4, 0xed, 0x90, 0x33,
+	0x15, 0x0b, 0xd3, 0xbf, 0xad, 0x37, 0xe5, 0xdf, 0xaa, 0xab, 0xc5, 0xd5, 0x59, 0x0a, 0x1b, 0x46,
+	0x81, 0x33, 0xdf, 0xf0, 0x43, 0xbe, 0x9d, 0x5a, 0x5c, 0x3d, 0x6d, 0x98, 0x49, 0x0f, 0xf4, 0x5e,
+	0xa7, 0xd2, 0x03, 0xba, 0x0e, 0x2b, 0x21, 0x1f, 0xbb, 0xc2, 0x4f, 0xf6, 0x3a, 0x89, 0xe8, 0x47,
+	0x50, 0x1e, 0xa9, 0x0b, 0x69, 0x5d, 0xf3, 0x50, 0x62, 0x76, 0x45, 0x67, 0x4b, 0x88, 0x9d, 0xc7,
+	0x10, 0x5d, 0x83, 0x65, 0x69, 0x8b, 0x90, 0x1b, 0xab, 0x6d, 0xd2, 0xcd, 0x99, 0x71, 0x40, 0x37,
+	0xa0, 0x74, 0xc9, 0x59, 0xa8, 0xac, 0x11, 0x67, 0x4a, 0x1a, 0x85, 0x36, 0xe9, 0x2e, 0x99, 0xa0,
+	0xa1, 0x3e, 0x22, 0xf8, 0x8b, 0x51, 0xa0, 0x0f, 0xb0, 0xa8, 0xeb, 0x92, 0x88, 0xd6, 0x61, 0x09,
+	0x2f, 0x13, 0xe8, 0x02, 0x5c, 0xd2, 0x16, 0x40, 0xc8, 0x83, 0x48, 0x31, 0x85, 0x0a, 0x4a, 0x9a,
+	0x3d, 0x83, 0xd0, 0x17, 0x50, 0x8d, 0x02, 0x4f, 0x30, 0xc7, 0x62, 0xd7, 0x1c, 0xbf, 0x2e, 0xa3,
+	0xac, 0x39, 0x95, 0x18, 0xdd, 0x8e, 0x41, 0xfc, 0xd6, 0x12, 0xda, 0x35, 0x0b, 0x5d, 0xe6, 0xdb,
+	0xdc, 0xa8, 0x68, 0x5e, 0x52, 0x7d, 0x9e, 0xa0, 0xf8, 0xad, 0x39, 0xe2, 0x9d, 0x3f, 0xd7, 0xb1,
+	0xaa, 0x99, 0xb5, 0x14, 0x4f, 0x7b, 0x7e, 0x0a, 0x8d, 0x8c, 0x9a, 0x75, 0xad, 0x69, 0x6e, 0xd6,
+	0x23, 0xeb, 0xbb, 0x09, 0x05, 0x4f, 0xd8, 0xf1, 0x14, 0x75, 0x7d, 0x8a, 0x15, 0x7d, 0xc9, 0x0e,
+	0x13, 0xb0, 0x9f, 0xc7, 0x83, 0x33, 0x33, 0x12, 0x7d, 0x0d, 0x34, 0xf5, 0x91, 0x6b, 0xe1, 0x45,
+	0x13, 0x6e, 0xd9, 0x2c, 0x30, 0x1a, 0x71, 0xfb, 0x24, 0x73, 0xae, 0x13, 0x3b, 0x2c, 0x40, 0x97,
+	0xba, 0xc7, 0xf6, 0xf8, 0x85, 0x32, 0xa8, 0xa6, 0x37, 0xe6, 0xe8, 0x87, 0xfc, 0x42, 0x2d, 0x74,
+	0xa9, 0xc7, 0x6d, 0xd2, 0xcd, 0x3f, 0x70, 0xa9, 0x85, 0x5e, 0xb9, 0x16, 0xef, 0xc8, 0x7d, 0xaf,
+	0x7c, 0xc0, 0xe5, 0x52, 0x19, 0x4f, 0x1e, 0x72, 0x07, 0x52, 0x2d, 0x72, 0xbf, 0xf5, 0x85, 0xee,
+	0xf7, 0x0f, 0x06, 0xfc, 0x34, 0x1e, 0xed, 0xa1, 0x01, 0x2f, 0xe0, 0xa3, 0x0c, 0x63, 0x11, 0x1f,
+	0x85, 0x2c, 0x72, 0xd7, 0x67, 0x7a, 0x2b, 0xee, 0xbb, 0x2b, 0x6a, 0x9e, 0xa1, 0x7a, 0x42, 0x2a,
+	0xa3, 0x19, 0x6f, 0xda, 0x14, 0x3e, 0x14, 0xf1, 0x70, 0x33, 0xc4, 0x51, 0x14, 0xfa, 0xc6, 0xf3,
+	0xfb, 0xc4, 0x7e, 0x14, 0xfa, 0x9d, 0x1e, 0x14, 0xd2, 0x1b, 0x80, 0x97, 0xdf, 0x63, 0x2a, 0x79,
+	0x87, 0x70, 0xa9, 0x11, 0xe1, 0x27, 0x6f, 0x0d, 0x2e, 0x5f, 0xd9, 0x50, 0x9e, 0xf5, 0x61, 0x5a,
+	0x82, 0xd5, 0xe1, 0xd9, 0xce, 0xce, 0x60, 0x38, 0xac, 0x3f, 0xa2, 0x4d, 0x58, 0x1f, 0x1e, 0xec,
+	0x7d, 0xb3, 0x7d, 0x7a, 0x66, 0x0e, 0xac, 0xaf, 0x8f, 0xcd, 0xa3, 0xed, 0x53, 0x6b, 0x60, 0x9a,
+	0xc7, 0x66, 0x9d, 0xd0, 0x67, 0xf0, 0x64, 0xe7, 0xf8, 0xe8, 0xe4, 0xec, 0x74, 0x60, 0x6d, 0xef,
+	0xee, 0x9a, 0x83, 0xe1, 0x30, 0x49, 0xe5, 0x68, 0x0d, 0x4a, 0xc7, 0xa7, 0xfb, 0x03, 0x33, 0x01,
+	0xd6, 0xb6, 0x02, 0xa8, 0xed, 0x47, 0xa3, 0x6f, 0x23, 0x1e, 0x7e, 0x3f, 0xe4, 0xe1, 0xb5, 0x6b,
+	0x73, 0xba, 0x05, 0xa5, 0x3d, 0xae, 0xd2, 0x47, 0x94, 0xd6, 0xe7, 0x9e, 0x5c, 0x93, 0xbf, 0x6d,
+	0x36, 0xee, 0x21, 0x32, 0xa0, 0x2f, 0xa1, 0xb0, 0xc7, 0x95, 0x36, 0x59, 0x5a, 0x99, 0x3e, 0x00,
+	0xc8, 0xae, 0xce, 0x86, 0x32, 0xe8, 0xbf, 0xb9, 0xb9, 0x6d, 0x91, 0x9f, 0x6f, 0x5b, 0xe4, 0x8f,
+	0xdb, 0x16, 0xf9, 0xf1, 0xae, 0x45, 0x7e, 0xba, 0x6b, 0x91, 0x9b, 0xbb, 0x16, 0x81, 0x92, 0x2b,
+	0x7a, 0x68, 0x38, 0x58, 0xd0, 0x2f, 0xec, 0x47, 0xa3, 0x13, 0xf4, 0xbc, 0x13, 0xf2, 0x1d, 0xfe,
+	0xf7, 0x34, 0x5a, 0xd1, 0x0e, 0xf8, 0xc5, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x26, 0xe9, 0xbf,
+	0xa1, 0x61, 0x09, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -902,108 +903,108 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// HubQueryClient is the client API for HubQuery service.
+// HubQueryServiceClient is the client API for HubQueryService service.
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type HubQueryClient interface {
+type HubQueryServiceClient interface {
 	GetSettings(ctx context.Context, in *SettingsReq, opts ...grpc.CallOption) (*SettingsResp, error)
 	GetHosts(ctx context.Context, in *HostsReq, opts ...grpc.CallOption) (*HostsResp, error)
 }
 
-type hubQueryClient struct {
+type hubQueryServiceClient struct {
 	cc *grpc.ClientConn
 }
 
-func NewHubQueryClient(cc *grpc.ClientConn) HubQueryClient {
-	return &hubQueryClient{cc}
+func NewHubQueryServiceClient(cc *grpc.ClientConn) HubQueryServiceClient {
+	return &hubQueryServiceClient{cc}
 }
 
-func (c *hubQueryClient) GetSettings(ctx context.Context, in *SettingsReq, opts ...grpc.CallOption) (*SettingsResp, error) {
+func (c *hubQueryServiceClient) GetSettings(ctx context.Context, in *SettingsReq, opts ...grpc.CallOption) (*SettingsResp, error) {
 	out := new(SettingsResp)
-	err := c.cc.Invoke(ctx, "/hub.HubQuery/GetSettings", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/hub.HubQueryService/GetSettings", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *hubQueryClient) GetHosts(ctx context.Context, in *HostsReq, opts ...grpc.CallOption) (*HostsResp, error) {
+func (c *hubQueryServiceClient) GetHosts(ctx context.Context, in *HostsReq, opts ...grpc.CallOption) (*HostsResp, error) {
 	out := new(HostsResp)
-	err := c.cc.Invoke(ctx, "/hub.HubQuery/GetHosts", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/hub.HubQueryService/GetHosts", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// HubQueryServer is the server API for HubQuery service.
-type HubQueryServer interface {
+// HubQueryServiceServer is the server API for HubQueryService service.
+type HubQueryServiceServer interface {
 	GetSettings(context.Context, *SettingsReq) (*SettingsResp, error)
 	GetHosts(context.Context, *HostsReq) (*HostsResp, error)
 }
 
-// UnimplementedHubQueryServer can be embedded to have forward compatible implementations.
-type UnimplementedHubQueryServer struct {
+// UnimplementedHubQueryServiceServer can be embedded to have forward compatible implementations.
+type UnimplementedHubQueryServiceServer struct {
 }
 
-func (*UnimplementedHubQueryServer) GetSettings(ctx context.Context, req *SettingsReq) (*SettingsResp, error) {
+func (*UnimplementedHubQueryServiceServer) GetSettings(ctx context.Context, req *SettingsReq) (*SettingsResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetSettings not implemented")
 }
-func (*UnimplementedHubQueryServer) GetHosts(ctx context.Context, req *HostsReq) (*HostsResp, error) {
+func (*UnimplementedHubQueryServiceServer) GetHosts(ctx context.Context, req *HostsReq) (*HostsResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetHosts not implemented")
 }
 
-func RegisterHubQueryServer(s *grpc.Server, srv HubQueryServer) {
-	s.RegisterService(&_HubQuery_serviceDesc, srv)
+func RegisterHubQueryServiceServer(s *grpc.Server, srv HubQueryServiceServer) {
+	s.RegisterService(&_HubQueryService_serviceDesc, srv)
 }
 
-func _HubQuery_GetSettings_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _HubQueryService_GetSettings_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(SettingsReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(HubQueryServer).GetSettings(ctx, in)
+		return srv.(HubQueryServiceServer).GetSettings(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/hub.HubQuery/GetSettings",
+		FullMethod: "/hub.HubQueryService/GetSettings",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(HubQueryServer).GetSettings(ctx, req.(*SettingsReq))
+		return srv.(HubQueryServiceServer).GetSettings(ctx, req.(*SettingsReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _HubQuery_GetHosts_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _HubQueryService_GetHosts_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(HostsReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(HubQueryServer).GetHosts(ctx, in)
+		return srv.(HubQueryServiceServer).GetHosts(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/hub.HubQuery/GetHosts",
+		FullMethod: "/hub.HubQueryService/GetHosts",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(HubQueryServer).GetHosts(ctx, req.(*HostsReq))
+		return srv.(HubQueryServiceServer).GetHosts(ctx, req.(*HostsReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-var _HubQuery_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "hub.HubQuery",
-	HandlerType: (*HubQueryServer)(nil),
+var _HubQueryService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "hub.HubQueryService",
+	HandlerType: (*HubQueryServiceServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
 			MethodName: "GetSettings",
-			Handler:    _HubQuery_GetSettings_Handler,
+			Handler:    _HubQueryService_GetSettings_Handler,
 		},
 		{
 			MethodName: "GetHosts",
-			Handler:    _HubQuery_GetHosts_Handler,
+			Handler:    _HubQueryService_GetHosts_Handler,
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
diff --git a/protos/hub/hub.proto b/protos/hub/hub.proto
index 20626b2..af57a2d 100644
--- a/protos/hub/hub.proto
+++ b/protos/hub/hub.proto
@@ -19,7 +19,7 @@ option java_package = "io.btfs.hub";
 import "github.com/tron-us/protobuf/gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 
-service HubQuery {
+service HubQueryService {
   rpc GetSettings(SettingsReq) returns (SettingsResp);
   rpc GetHosts(HostsReq) returns (HostsResp);
 }
diff --git a/protos/status/status.pb.go b/protos/status/status.pb.go
index c9aa418..94bb30a 100644
--- a/protos/status/status.pb.go
+++ b/protos/status/status.pb.go
@@ -388,51 +388,52 @@ func init() { proto.RegisterFile("protos/status/status.proto", fileDescriptor_e9
 func init() { golang_proto.RegisterFile("protos/status/status.proto", fileDescriptor_e9255cc60c5ca429) }
 
 var fileDescriptor_e9255cc60c5ca429 = []byte{
-	// 689 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcf, 0x4f, 0x14, 0x31,
-	0x14, 0xb6, 0x08, 0x03, 0xd3, 0xdd, 0x35, 0xb1, 0x46, 0x9c, 0xac, 0xba, 0x8b, 0xeb, 0x85, 0x03,
-	0xce, 0x1a, 0x30, 0x26, 0x62, 0xa2, 0xc9, 0x12, 0xa2, 0x44, 0x24, 0x64, 0x50, 0x12, 0xbd, 0x4c,
-	0xba, 0x33, 0xdd, 0xd9, 0x86, 0x4e, 0x3b, 0xe9, 0x74, 0x30, 0xeb, 0x5f, 0xa1, 0x37, 0xff, 0x1c,
-	0x8e, 0x1c, 0xfd, 0x0b, 0xd0, 0xc0, 0xc9, 0x2b, 0x37, 0x6f, 0xa6, 0x3f, 0x06, 0xfc, 0xc5, 0xc1,
-	0xc4, 0xd3, 0xf4, 0xfb, 0xde, 0xfb, 0xda, 0xbe, 0xaf, 0xef, 0x0d, 0x6c, 0x17, 0x52, 0x28, 0x51,
-	0xf6, 0x4b, 0x85, 0x55, 0x55, 0x7f, 0x42, 0x43, 0x22, 0xcf, 0xa2, 0xf6, 0xfd, 0x8c, 0xaa, 0x71,
-	0x35, 0x0c, 0x13, 0x91, 0xf7, 0x95, 0x14, 0xfc, 0x5e, 0x55, 0xf6, 0x4d, 0xc6, 0xb0, 0x1a, 0xf5,
-	0x33, 0x91, 0x09, 0x03, 0xcc, 0xca, 0x2a, 0xdb, 0x37, 0x33, 0x21, 0x32, 0x46, 0xce, 0xb3, 0x48,
-	0x5e, 0xa8, 0x89, 0x0b, 0x76, 0x7f, 0x0f, 0x2a, 0x9a, 0x93, 0x52, 0xe1, 0xbc, 0xb0, 0x09, 0xbd,
-	0x11, 0x6c, 0xed, 0xd0, 0x8c, 0x93, 0xf4, 0x25, 0x51, 0x92, 0x26, 0x25, 0xba, 0x0d, 0x61, 0x51,
-	0x0d, 0x19, 0x4d, 0xe2, 0x3d, 0x32, 0x09, 0xc0, 0x02, 0x58, 0x6c, 0x46, 0xbe, 0x65, 0x5e, 0x90,
-	0x09, 0xba, 0x05, 0xfd, 0x92, 0x66, 0x1c, 0xab, 0x4a, 0x92, 0x60, 0xca, 0x46, 0xcf, 0x08, 0x14,
-	0xc0, 0xd9, 0x02, 0x4f, 0x98, 0xc0, 0x69, 0x70, 0xd9, 0xc4, 0x6a, 0xd8, 0xfb, 0x38, 0x05, 0xe1,
-	0x96, 0x48, 0xc9, 0x73, 0x82, 0x99, 0x1a, 0xa3, 0x37, 0x10, 0x2a, 0x3c, 0x64, 0x24, 0xe6, 0x38,
-	0x27, 0xe6, 0x14, 0x7f, 0xb0, 0x7a, 0x7a, 0xd4, 0x7d, 0x58, 0x64, 0xab, 0xbd, 0xb1, 0xc9, 0x89,
-	0x73, 0xc1, 0xa9, 0x12, 0x92, 0xf2, 0x6c, 0x09, 0x33, 0x8a, 0xcb, 0x55, 0xb5, 0x94, 0xd2, 0x32,
-	0xc1, 0x32, 0x8d, 0x2b, 0xbe, 0xc7, 0xc5, 0x3b, 0x1e, 0x27, 0x82, 0x55, 0x39, 0x2f, 0x7b, 0x91,
-	0x6f, 0x76, 0xdb, 0xc2, 0x39, 0x41, 0x37, 0xe0, 0x2c, 0x17, 0x29, 0x89, 0x69, 0x6a, 0xee, 0xe7,
-	0x47, 0x9e, 0x86, 0x1b, 0x29, 0xba, 0x03, 0x9b, 0x43, 0x35, 0x2a, 0xe3, 0x7d, 0x22, 0x4b, 0x2a,
-	0xb8, 0xb9, 0xa1, 0x1f, 0x35, 0x34, 0xb7, 0x6b, 0x29, 0x74, 0x17, 0xb6, 0x46, 0x98, 0xb2, 0x4a,
-	0x92, 0xb8, 0x10, 0x94, 0xab, 0x60, 0xda, 0xe4, 0x34, 0x1d, 0xb9, 0xad, 0x39, 0xf4, 0x0c, 0x36,
-	0xb5, 0x8b, 0x71, 0x22, 0x09, 0x56, 0x24, 0x0d, 0x66, 0x16, 0xc0, 0x62, 0x63, 0xb9, 0x1d, 0x5a,
-	0xab, 0xc3, 0xda, 0xea, 0xf0, 0x55, 0x6d, 0xf5, 0x60, 0xee, 0xf0, 0xa8, 0x7b, 0xe9, 0xc3, 0x97,
-	0x2e, 0x88, 0x1a, 0x5a, 0xb9, 0x66, 0x85, 0xbd, 0xef, 0x00, 0xfa, 0xda, 0x93, 0x75, 0x29, 0x85,
-	0x44, 0xd1, 0x5f, 0x2c, 0x59, 0x39, 0x3d, 0xea, 0xf6, 0xb5, 0x25, 0x8a, 0x94, 0x2a, 0x26, 0x3a,
-	0xef, 0x9f, 0xbc, 0xb8, 0x06, 0x67, 0xc6, 0xf1, 0x3e, 0x66, 0xce, 0x89, 0xe9, 0xf1, 0x2e, 0x66,
-	0xda, 0xa0, 0x82, 0x10, 0xa9, 0x0d, 0xb2, 0x16, 0x78, 0x1a, 0x5a, 0x83, 0xcc, 0x11, 0xb1, 0xed,
-	0x45, 0x57, 0x7c, 0xc3, 0x70, 0x3b, 0x86, 0xfa, 0x7f, 0xb5, 0x7f, 0x03, 0xb0, 0xb1, 0x51, 0x2c,
-	0x6f, 0x8a, 0x04, 0x2b, 0xed, 0x3c, 0x82, 0xd3, 0xb4, 0xd8, 0x7f, 0x60, 0xeb, 0x8e, 0xcc, 0x5a,
-	0xbf, 0x46, 0x22, 0x2a, 0xae, 0xe4, 0x24, 0x2e, 0xc7, 0x42, 0x2a, 0x57, 0x45, 0xd3, 0x91, 0x3b,
-	0x9a, 0xd3, 0x97, 0xae, 0x93, 0x98, 0xe0, 0x59, 0xfd, 0xaa, 0x8e, 0xdb, 0x14, 0x3c, 0x43, 0xf3,
-	0xd0, 0x93, 0x24, 0xd3, 0x4f, 0x6e, 0x2b, 0x72, 0x48, 0x9f, 0x99, 0x50, 0x35, 0x31, 0x45, 0xf8,
-	0x91, 0x59, 0xa3, 0x36, 0x9c, 0x63, 0x58, 0x51, 0x55, 0xa5, 0x24, 0xf0, 0x16, 0xc0, 0xe2, 0x54,
-	0x74, 0x86, 0x75, 0xef, 0xeb, 0x23, 0x6c, 0x70, 0xd6, 0x04, 0xcf, 0x09, 0xdd, 0xfb, 0xef, 0x69,
-	0x91, 0x88, 0x94, 0x04, 0x73, 0x66, 0xc3, 0x1a, 0x2e, 0x1f, 0x00, 0xe8, 0x39, 0xff, 0x9e, 0xc0,
-	0xd6, 0xeb, 0x22, 0xc5, 0x8a, 0xd4, 0xe3, 0x76, 0x3d, 0x74, 0xbf, 0x81, 0x5f, 0xa6, 0xb0, 0x3d,
-	0xff, 0x87, 0xa3, 0xeb, 0x7a, 0xaa, 0xd1, 0x63, 0xd8, 0x5a, 0x13, 0x8c, 0x91, 0x44, 0xb9, 0x41,
-	0x42, 0xb5, 0xfe, 0x7c, 0xb8, 0x2e, 0x14, 0x3f, 0x82, 0x4d, 0x27, 0xb6, 0x1d, 0x77, 0xf5, 0x67,
-	0xad, 0xa1, 0x2e, 0x92, 0x0e, 0x9e, 0x1e, 0x1e, 0x77, 0xc0, 0xe7, 0xe3, 0x0e, 0xf8, 0x7a, 0xdc,
-	0x01, 0x9f, 0x4e, 0x3a, 0xe0, 0xe0, 0xa4, 0x03, 0x0e, 0x4f, 0x3a, 0x00, 0x5e, 0xa1, 0x22, 0xd4,
-	0x23, 0xe4, 0xf6, 0x1a, 0x34, 0x6c, 0xa5, 0xdb, 0x5a, 0xbf, 0x0d, 0xde, 0xba, 0xff, 0xda, 0xd0,
-	0x33, 0x1b, 0xae, 0xfc, 0x08, 0x00, 0x00, 0xff, 0xff, 0x1b, 0xe5, 0x9c, 0xbb, 0x04, 0x05, 0x00,
-	0x00,
+	// 706 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x54, 0xcf, 0x6f, 0xd3, 0x30,
+	0x14, 0xc6, 0x63, 0xeb, 0x16, 0xb7, 0x45, 0xc2, 0x88, 0x11, 0x15, 0x68, 0x47, 0xb9, 0xec, 0x30,
+	0x5a, 0xd4, 0x21, 0x24, 0x86, 0x04, 0x52, 0xa7, 0x09, 0x26, 0xc6, 0x34, 0xa5, 0x30, 0x09, 0x2e,
+	0x91, 0x9b, 0xbc, 0xa6, 0xd6, 0x12, 0x3b, 0x72, 0x9c, 0xa2, 0xf2, 0x57, 0xc0, 0x8d, 0x3f, 0x67,
+	0x37, 0x76, 0xe4, 0x2f, 0x18, 0x68, 0x3b, 0x71, 0xdd, 0x8d, 0x1b, 0xb2, 0x9d, 0x6c, 0xfc, 0xda,
+	0x01, 0x89, 0x0b, 0xa7, 0xe4, 0x7d, 0xef, 0x7d, 0xb6, 0xbf, 0xcf, 0xef, 0x19, 0x37, 0x52, 0x29,
+	0x94, 0xc8, 0xba, 0x99, 0xa2, 0x2a, 0x2f, 0x3f, 0x1d, 0x03, 0x92, 0x8a, 0x8d, 0x1a, 0x77, 0x23,
+	0xa6, 0xc6, 0xf9, 0xb0, 0x13, 0x88, 0xa4, 0xab, 0xa4, 0xe0, 0x77, 0xf2, 0xac, 0x6b, 0x2a, 0x86,
+	0xf9, 0xa8, 0x1b, 0x89, 0x48, 0x98, 0xc0, 0xfc, 0x59, 0x66, 0xe3, 0x7a, 0x24, 0x44, 0x14, 0xc3,
+	0x59, 0x15, 0x24, 0xa9, 0x9a, 0x16, 0xc9, 0xd6, 0xaf, 0x49, 0xc5, 0x12, 0xc8, 0x14, 0x4d, 0x52,
+	0x5b, 0xd0, 0x1e, 0xe1, 0xfa, 0x80, 0x45, 0x1c, 0xc2, 0xe7, 0xa0, 0x24, 0x0b, 0x32, 0x72, 0x13,
+	0xe3, 0x34, 0x1f, 0xc6, 0x2c, 0xf0, 0xf7, 0x60, 0xea, 0xa2, 0x25, 0xb4, 0x5c, 0xf3, 0x1c, 0x8b,
+	0x3c, 0x83, 0x29, 0xb9, 0x81, 0x9d, 0x8c, 0x45, 0x9c, 0xaa, 0x5c, 0x82, 0x3b, 0x63, 0xb3, 0xa7,
+	0x00, 0x71, 0xf1, 0x7c, 0x4a, 0xa7, 0xb1, 0xa0, 0xa1, 0x7b, 0xd1, 0xe4, 0xca, 0xb0, 0xfd, 0x7e,
+	0x06, 0xe3, 0x6d, 0x11, 0xc2, 0x53, 0xa0, 0xb1, 0x1a, 0x93, 0x57, 0x18, 0x2b, 0x3a, 0x8c, 0xc1,
+	0xe7, 0x34, 0x01, 0xb3, 0x8b, 0xd3, 0x5f, 0x3b, 0x39, 0x6c, 0xdd, 0x4f, 0xa3, 0xb5, 0xf6, 0xd8,
+	0xd4, 0xf8, 0x89, 0xe0, 0x4c, 0x09, 0xc9, 0x78, 0xb4, 0x42, 0x63, 0x46, 0xb3, 0x35, 0xb5, 0x12,
+	0xb2, 0x2c, 0xa0, 0x32, 0xf4, 0x73, 0xbe, 0xc7, 0xc5, 0x1b, 0xee, 0x07, 0x22, 0xce, 0x13, 0x9e,
+	0xb5, 0x3d, 0xc7, 0xac, 0xb6, 0x4d, 0x13, 0x20, 0xd7, 0xf0, 0x3c, 0x17, 0x21, 0xf8, 0x2c, 0x34,
+	0xe7, 0x73, 0xbc, 0x8a, 0x0e, 0x37, 0x43, 0x72, 0x0b, 0xd7, 0x86, 0x6a, 0x94, 0xf9, 0x13, 0x90,
+	0x19, 0x13, 0xdc, 0x9c, 0xd0, 0xf1, 0xaa, 0x1a, 0xdb, 0xb5, 0x10, 0xb9, 0x8d, 0xeb, 0x23, 0xca,
+	0xe2, 0x5c, 0x82, 0x9f, 0x0a, 0xc6, 0x95, 0x3b, 0x6b, 0x6a, 0x6a, 0x05, 0xb8, 0xa3, 0x31, 0xf2,
+	0x04, 0xd7, 0xb4, 0x8b, 0x7e, 0x20, 0x81, 0x2a, 0x08, 0xdd, 0xb9, 0x25, 0xb4, 0x5c, 0xed, 0x35,
+	0x3a, 0xd6, 0xea, 0x4e, 0x69, 0x75, 0xe7, 0x45, 0x69, 0x75, 0x7f, 0xe1, 0xe0, 0xb0, 0x75, 0xe1,
+	0xdd, 0xe7, 0x16, 0xf2, 0xaa, 0x9a, 0xb9, 0x6e, 0x89, 0xed, 0x6f, 0x08, 0x3b, 0xda, 0x93, 0x0d,
+	0x29, 0x85, 0x24, 0xde, 0x1f, 0x2c, 0x59, 0x3d, 0x39, 0x6c, 0x75, 0xb5, 0x25, 0x0a, 0x32, 0xe5,
+	0x83, 0xae, 0xfb, 0x2b, 0x2f, 0xae, 0xe0, 0xb9, 0xb1, 0x3f, 0xa1, 0x71, 0xe1, 0xc4, 0xec, 0x78,
+	0x97, 0xc6, 0xda, 0xa0, 0x14, 0x40, 0x6a, 0x83, 0xac, 0x05, 0x15, 0x1d, 0x5a, 0x83, 0xcc, 0x16,
+	0xbe, 0xed, 0xc5, 0x42, 0x7c, 0xd5, 0x60, 0x03, 0x03, 0xfd, 0x3b, 0xed, 0x5f, 0x11, 0xae, 0x6e,
+	0xa6, 0xbd, 0x2d, 0x11, 0x50, 0xa5, 0x9d, 0x27, 0x78, 0x96, 0xa5, 0x93, 0x7b, 0x56, 0xb7, 0x67,
+	0xfe, 0xf5, 0x6d, 0x04, 0x22, 0xe7, 0x4a, 0x4e, 0xfd, 0x6c, 0x2c, 0xa4, 0x2a, 0x54, 0xd4, 0x0a,
+	0x70, 0xa0, 0x31, 0x7d, 0xe8, 0xb2, 0x28, 0x16, 0x3c, 0x2a, 0x6f, 0xb5, 0xc0, 0xb6, 0x04, 0x8f,
+	0xc8, 0x22, 0xae, 0x48, 0x88, 0xf4, 0x95, 0x5b, 0x45, 0x45, 0xa4, 0xf7, 0x0c, 0x98, 0x9a, 0x1a,
+	0x11, 0x8e, 0x67, 0xfe, 0x49, 0x03, 0x2f, 0xc4, 0x54, 0x31, 0x95, 0x87, 0xe0, 0x56, 0x96, 0xd0,
+	0xf2, 0x8c, 0x77, 0x1a, 0xeb, 0xde, 0xd7, 0x5b, 0xd8, 0xe4, 0xbc, 0x49, 0x9e, 0x01, 0xba, 0xf7,
+	0xdf, 0xb2, 0x34, 0x10, 0x21, 0xb8, 0x0b, 0x66, 0xc1, 0x32, 0xec, 0xed, 0x23, 0x5c, 0x29, 0xfc,
+	0x7b, 0x84, 0xeb, 0x2f, 0xd3, 0x90, 0x2a, 0x28, 0xc7, 0xed, 0x6a, 0xa7, 0x78, 0x06, 0x7e, 0x9a,
+	0xc2, 0xc6, 0xe2, 0x6f, 0x8e, 0x6e, 0xe8, 0xa9, 0x26, 0x0f, 0x71, 0x7d, 0x5d, 0xc4, 0x31, 0x04,
+	0xaa, 0x18, 0x24, 0x52, 0xf2, 0xcf, 0x86, 0xeb, 0x5c, 0xf2, 0x03, 0x5c, 0x2b, 0xc8, 0xb6, 0xe3,
+	0x2e, 0xff, 0xc8, 0x35, 0xd0, 0x79, 0xd4, 0xde, 0x47, 0x84, 0xeb, 0x56, 0xc2, 0x00, 0xe4, 0x84,
+	0x05, 0xf0, 0xbf, 0x2a, 0xe9, 0x3f, 0x3e, 0x38, 0x6a, 0xa2, 0x4f, 0x47, 0x4d, 0xf4, 0xe5, 0xa8,
+	0x89, 0x3e, 0x1c, 0x37, 0xd1, 0xfe, 0x71, 0x13, 0x1d, 0x1c, 0x37, 0x11, 0xbe, 0xc4, 0x44, 0x47,
+	0x3f, 0x06, 0xc5, 0x5a, 0xfd, 0xaa, 0x15, 0xbc, 0xa3, 0xf9, 0x3b, 0xe8, 0x75, 0xf1, 0x42, 0x0f,
+	0x2b, 0x66, 0xc1, 0xd5, 0xef, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x13, 0xfb, 0x08, 0xce, 0x05,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -587,6 +588,150 @@ var _Status_serviceDesc = grpc.ServiceDesc{
 	Metadata: "protos/status/status.proto",
 }
 
+// StatusServiceClient is the client API for StatusService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type StatusServiceClient interface {
+	UpdateMetrics(ctx context.Context, in *SignedMetrics, opts ...grpc.CallOption) (*types.Empty, error)
+	CollectHealth(ctx context.Context, in *NodeHealth, opts ...grpc.CallOption) (*types.Empty, error)
+	CollectError(ctx context.Context, in *NodeError, opts ...grpc.CallOption) (*types.Empty, error)
+}
+
+type statusServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewStatusServiceClient(cc *grpc.ClientConn) StatusServiceClient {
+	return &statusServiceClient{cc}
+}
+
+func (c *statusServiceClient) UpdateMetrics(ctx context.Context, in *SignedMetrics, opts ...grpc.CallOption) (*types.Empty, error) {
+	out := new(types.Empty)
+	err := c.cc.Invoke(ctx, "/status.StatusService/UpdateMetrics", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *statusServiceClient) CollectHealth(ctx context.Context, in *NodeHealth, opts ...grpc.CallOption) (*types.Empty, error) {
+	out := new(types.Empty)
+	err := c.cc.Invoke(ctx, "/status.StatusService/CollectHealth", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *statusServiceClient) CollectError(ctx context.Context, in *NodeError, opts ...grpc.CallOption) (*types.Empty, error) {
+	out := new(types.Empty)
+	err := c.cc.Invoke(ctx, "/status.StatusService/CollectError", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// StatusServiceServer is the server API for StatusService service.
+type StatusServiceServer interface {
+	UpdateMetrics(context.Context, *SignedMetrics) (*types.Empty, error)
+	CollectHealth(context.Context, *NodeHealth) (*types.Empty, error)
+	CollectError(context.Context, *NodeError) (*types.Empty, error)
+}
+
+// UnimplementedStatusServiceServer can be embedded to have forward compatible implementations.
+type UnimplementedStatusServiceServer struct {
+}
+
+func (*UnimplementedStatusServiceServer) UpdateMetrics(ctx context.Context, req *SignedMetrics) (*types.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UpdateMetrics not implemented")
+}
+func (*UnimplementedStatusServiceServer) CollectHealth(ctx context.Context, req *NodeHealth) (*types.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method CollectHealth not implemented")
+}
+func (*UnimplementedStatusServiceServer) CollectError(ctx context.Context, req *NodeError) (*types.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method CollectError not implemented")
+}
+
+func RegisterStatusServiceServer(s *grpc.Server, srv StatusServiceServer) {
+	s.RegisterService(&_StatusService_serviceDesc, srv)
+}
+
+func _StatusService_UpdateMetrics_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SignedMetrics)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(StatusServiceServer).UpdateMetrics(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/status.StatusService/UpdateMetrics",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(StatusServiceServer).UpdateMetrics(ctx, req.(*SignedMetrics))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _StatusService_CollectHealth_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(NodeHealth)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(StatusServiceServer).CollectHealth(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/status.StatusService/CollectHealth",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(StatusServiceServer).CollectHealth(ctx, req.(*NodeHealth))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _StatusService_CollectError_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(NodeError)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(StatusServiceServer).CollectError(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/status.StatusService/CollectError",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(StatusServiceServer).CollectError(ctx, req.(*NodeError))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _StatusService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "status.StatusService",
+	HandlerType: (*StatusServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "UpdateMetrics",
+			Handler:    _StatusService_UpdateMetrics_Handler,
+		},
+		{
+			MethodName: "CollectHealth",
+			Handler:    _StatusService_CollectHealth_Handler,
+		},
+		{
+			MethodName: "CollectError",
+			Handler:    _StatusService_CollectError_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "protos/status/status.proto",
+}
+
 func (m *SignedMetrics) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
diff --git a/protos/status/status.proto b/protos/status/status.proto
index 2938165..b07be66 100644
--- a/protos/status/status.proto
+++ b/protos/status/status.proto
@@ -26,6 +26,12 @@ service Status {
   rpc CollectError(NodeError) returns (google.protobuf.Empty);
 }
 
+service StatusService {
+  rpc UpdateMetrics(SignedMetrics) returns (google.protobuf.Empty);
+  rpc CollectHealth(NodeHealth) returns (google.protobuf.Empty);
+  rpc CollectError(NodeError) returns (google.protobuf.Empty);
+}
+
 message SignedMetrics {
   bytes public_key = 1;
   bytes signature = 2;
diff --git a/utils/grpc/client.go b/utils/grpc/client.go
index 5e32cf2..05f070a 100644
--- a/utils/grpc/client.go
+++ b/utils/grpc/client.go
@@ -11,14 +11,16 @@ import (
 	"strings"
 	"time"
 
-	"github.com/tron-us/go-btfs-common/protos/escrow"
-	"github.com/tron-us/go-btfs-common/protos/guard"
-	"github.com/tron-us/go-btfs-common/protos/hub"
-	"github.com/tron-us/go-btfs-common/protos/status"
+	escrowpb "github.com/tron-us/go-btfs-common/protos/escrow"
+	guardpb "github.com/tron-us/go-btfs-common/protos/guard"
+	hubpb "github.com/tron-us/go-btfs-common/protos/hub"
+	sharedpb "github.com/tron-us/go-btfs-common/protos/shared"
+	statuspb "github.com/tron-us/go-btfs-common/protos/status"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/connectivity"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/health/grpc_health_v1"
 )
 
 const (
@@ -47,14 +49,18 @@ func (g *ClientBuilder) doWithContext(ctx context.Context, f interface{}) error
 		return errors.New("failed to get connection")
 	}
 	switch v := f.(type) {
-	case func(context.Context, status.StatusClient) error:
-		return v(ctx, status.NewStatusClient(conn))
-	case func(context.Context, hub.HubQueryClient) error:
-		return v(ctx, hub.NewHubQueryClient(conn))
-	case func(context.Context, guard.GuardServiceClient) error:
-		return v(ctx, guard.NewGuardServiceClient(conn))
-	case func(context.Context, escrow.EscrowServiceClient) error:
-		return v(ctx, escrow.NewEscrowServiceClient(conn))
+	case func(context.Context, statuspb.StatusServiceClient) error:
+		return v(ctx, statuspb.NewStatusServiceClient(conn))
+	case func(context.Context, hubpb.HubQueryServiceClient) error:
+		return v(ctx, hubpb.NewHubQueryServiceClient(conn))
+	case func(context.Context, guardpb.GuardServiceClient) error:
+		return v(ctx, guardpb.NewGuardServiceClient(conn))
+	case func(context.Context, escrowpb.EscrowServiceClient) error:
+		return v(ctx, escrowpb.NewEscrowServiceClient(conn))
+	case func(ctx context.Context, client sharedpb.RuntimeServiceClient) error:
+		return v(ctx, sharedpb.NewRuntimeServiceClient(conn))
+	case func(ctx context.Context, client grpc_health_v1.HealthClient) error:
+		return v(ctx, grpc_health_v1.NewHealthClient(conn))
 	default:
 		return fmt.Errorf("illegal function: %T", f)
 	}
diff --git a/utils/grpc/escrow.go b/utils/grpc/escrow.go
index 8f38ad1..f520789 100644
--- a/utils/grpc/escrow.go
+++ b/utils/grpc/escrow.go
@@ -2,7 +2,8 @@ package grpc
 
 import (
 	"context"
-	"github.com/tron-us/go-btfs-common/protos/escrow"
+
+	escrowpb "github.com/tron-us/go-btfs-common/protos/escrow"
 )
 
 func EscrowClient(addr string) *EscrowClientBuilder {
@@ -13,6 +14,7 @@ type EscrowClientBuilder struct {
 	ClientBuilder
 }
 
-func (g *EscrowClientBuilder) WithContext(ctx context.Context, f func(ctx context.Context, client escrow.EscrowServiceClient) error) error {
+func (g *EscrowClientBuilder) WithContext(ctx context.Context, f func(ctx context.Context,
+	client escrowpb.EscrowServiceClient) error) error {
 	return g.doWithContext(ctx, f)
 }
diff --git a/utils/grpc/guard.go b/utils/grpc/guard.go
index ce1c345..068e206 100644
--- a/utils/grpc/guard.go
+++ b/utils/grpc/guard.go
@@ -2,7 +2,8 @@ package grpc
 
 import (
 	"context"
-	"github.com/tron-us/go-btfs-common/protos/guard"
+
+	guardpb "github.com/tron-us/go-btfs-common/protos/guard"
 )
 
 func GuardClient(addr string) *GuardClientBuilder {
@@ -13,6 +14,7 @@ type GuardClientBuilder struct {
 	ClientBuilder
 }
 
-func (g *GuardClientBuilder) WithContext(ctx context.Context, f func(ctx context.Context, client guard.GuardServiceClient) error) error {
+func (g *GuardClientBuilder) WithContext(ctx context.Context, f func(ctx context.Context,
+	client guardpb.GuardServiceClient) error) error {
 	return g.doWithContext(ctx, f)
 }
diff --git a/utils/grpc/health_check.go b/utils/grpc/health_check.go
new file mode 100644
index 0000000..dac7676
--- /dev/null
+++ b/utils/grpc/health_check.go
@@ -0,0 +1,19 @@
+package grpc
+
+import (
+	"context"
+	"google.golang.org/grpc/health/grpc_health_v1"
+)
+
+func HealthCheckClient(addr string) *HealthCheckClientBuilder {
+	return &HealthCheckClientBuilder{builder(addr)}
+}
+
+type HealthCheckClientBuilder struct {
+	ClientBuilder
+}
+
+func (g *HealthCheckClientBuilder) WithContext(ctx context.Context, f func(ctx context.Context,
+	client grpc_health_v1.HealthClient) error) error {
+	return g.doWithContext(ctx, f)
+}
diff --git a/utils/grpc/hub.go b/utils/grpc/hub.go
index 9fcb33e..548292f 100644
--- a/utils/grpc/hub.go
+++ b/utils/grpc/hub.go
@@ -2,7 +2,8 @@ package grpc
 
 import (
 	"context"
-	"github.com/tron-us/go-btfs-common/protos/hub"
+
+	hubpb "github.com/tron-us/go-btfs-common/protos/hub"
 )
 
 func HubQueryClient(addr string) *HubQueryClientBuilder {
@@ -13,6 +14,7 @@ type HubQueryClientBuilder struct {
 	ClientBuilder
 }
 
-func (g *HubQueryClientBuilder) WithContext(ctx context.Context, f func(ctx context.Context, client hub.HubQueryClient) error) error {
+func (g *HubQueryClientBuilder) WithContext(ctx context.Context, f func(ctx context.Context,
+	client hubpb.HubQueryServiceClient) error) error {
 	return g.doWithContext(ctx, f)
 }
diff --git a/utils/grpc/runtime.go b/utils/grpc/runtime.go
new file mode 100644
index 0000000..6db820b
--- /dev/null
+++ b/utils/grpc/runtime.go
@@ -0,0 +1,20 @@
+package grpc
+
+import (
+	"context"
+
+	sharedpb "github.com/tron-us/go-btfs-common/protos/shared"
+)
+
+func RuntimeClient(addr string) *RuntimeClientBuilder {
+	return &RuntimeClientBuilder{builder(addr)}
+}
+
+type RuntimeClientBuilder struct {
+	ClientBuilder
+}
+
+func (g *RuntimeClientBuilder) WithContext(ctx context.Context, f func(ctx context.Context,
+	client sharedpb.RuntimeServiceClient) error) error {
+	return g.doWithContext(ctx, f)
+}
diff --git a/utils/grpc/status.go b/utils/grpc/status.go
index fdb77f2..edb1874 100644
--- a/utils/grpc/status.go
+++ b/utils/grpc/status.go
@@ -2,7 +2,8 @@ package grpc
 
 import (
 	"context"
-	"github.com/tron-us/go-btfs-common/protos/status"
+
+	statuspb "github.com/tron-us/go-btfs-common/protos/status"
 )
 
 func StatusClient(addr string) *StatusClientBuilder {
@@ -13,6 +14,7 @@ type StatusClientBuilder struct {
 	ClientBuilder
 }
 
-func (g *StatusClientBuilder) WithContext(ctx context.Context, f func(ctx context.Context, client status.StatusClient) error) error {
+func (g *StatusClientBuilder) WithContext(ctx context.Context, f func(ctx context.Context,
+	client statuspb.StatusServiceClient) error) error {
 	return g.doWithContext(ctx, f)
 }