diff --git a/proto/umee/leverage/v1/query.proto b/proto/umee/leverage/v1/query.proto
index 9573dd7fb7..9d957c7ffb 100644
--- a/proto/umee/leverage/v1/query.proto
+++ b/proto/umee/leverage/v1/query.proto
@@ -118,13 +118,13 @@ message QueryRegisteredTokensResponse {
   repeated Token registry = 1 [(gogoproto.nullable) = false];
 }
 
-// QueryRegisteredTokenMarkets defines the request structure for the RegisteredTokenMarkets
+// QueryRegisteredTokensWithMarkets defines the request structure for the RegisteredTokenMarkets
 // gRPC service handler.
-message QueryRegisteredTokenMarkets {}
+message QueryRegisteredTokensWithMarkets {}
 
-// QueryRegisteredTokenMarketsResponse defines the response structure for the
-// RegisteredTokenMarkets gRPC service handler.
-message QueryRegisteredTokenMarketsResponse {
+// QueryRegisteredTokensWithMarketsResponse defines the response structure for the
+// RegisteredTokensWithMarkets gRPC service handler.
+message QueryRegisteredTokensWithMarketsResponse {
   repeated TokenMarket markets = 1 [(gogoproto.nullable) = false];
 }
 
diff --git a/x/leverage/keeper/grpc_query.go b/x/leverage/keeper/grpc_query.go
index 8800b88466..782788653f 100644
--- a/x/leverage/keeper/grpc_query.go
+++ b/x/leverage/keeper/grpc_query.go
@@ -62,10 +62,10 @@ func (q Querier) RegisteredTokens(
 	}, nil
 }
 
-func (q Querier) RegisteredTokenMarkets(
+func (q Querier) RegisteredTokensWithMarkets(
 	goCtx context.Context,
-	req *types.QueryRegisteredTokenMarkets,
-) (*types.QueryRegisteredTokenMarketsResponse, error) {
+	req *types.QueryRegisteredTokensWithMarkets,
+) (*types.QueryRegisteredTokensWithMarketsResponse, error) {
 	if req == nil {
 		return nil, status.Error(codes.InvalidArgument, "empty request")
 	}
@@ -86,7 +86,7 @@ func (q Querier) RegisteredTokenMarkets(
 		})
 	}
 
-	return &types.QueryRegisteredTokenMarketsResponse{
+	return &types.QueryRegisteredTokensWithMarketsResponse{
 		Markets: markets,
 	}, nil
 }
diff --git a/x/leverage/keeper/grpc_query_test.go b/x/leverage/keeper/grpc_query_test.go
index 744ddb1ed9..e819596ec5 100644
--- a/x/leverage/keeper/grpc_query_test.go
+++ b/x/leverage/keeper/grpc_query_test.go
@@ -102,11 +102,11 @@ func (s *IntegrationTestSuite) TestQuerier_MarketSummary() {
 func (s *IntegrationTestSuite) TestQuerier_TokenMarkets() {
 	require := s.Require()
 
-	req := &types.QueryRegisteredTokenMarkets{}
-	resp, err := s.queryClient.RegisteredTokenMarkets(context.Background(), req)
+	req := &types.QueryRegisteredTokensWithMarkets{}
+	resp, err := s.queryClient.RegisteredTokensWithMarkets(context.Background(), req)
 	require.NoError(err)
 
-	expected := types.QueryRegisteredTokenMarketsResponse{
+	expected := types.QueryRegisteredTokensWithMarketsResponse{
 		Markets: []types.TokenMarket{},
 	}
 	tokens := s.tk.GetAllRegisteredTokens(s.ctx)
diff --git a/x/leverage/types/query.pb.go b/x/leverage/types/query.pb.go
index 3b89661866..06c1acf7fa 100644
--- a/x/leverage/types/query.pb.go
+++ b/x/leverage/types/query.pb.go
@@ -187,23 +187,23 @@ func (m *QueryRegisteredTokensResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_QueryRegisteredTokensResponse proto.InternalMessageInfo
 
-// QueryRegisteredTokenMarkets defines the request structure for the RegisteredTokenMarkets
+// QueryRegisteredTokensWithMarkets defines the request structure for the RegisteredTokenMarkets
 // gRPC service handler.
-type QueryRegisteredTokenMarkets struct {
+type QueryRegisteredTokensWithMarkets struct {
 }
 
-func (m *QueryRegisteredTokenMarkets) Reset()         { *m = QueryRegisteredTokenMarkets{} }
-func (m *QueryRegisteredTokenMarkets) String() string { return proto.CompactTextString(m) }
-func (*QueryRegisteredTokenMarkets) ProtoMessage()    {}
-func (*QueryRegisteredTokenMarkets) Descriptor() ([]byte, []int) {
+func (m *QueryRegisteredTokensWithMarkets) Reset()         { *m = QueryRegisteredTokensWithMarkets{} }
+func (m *QueryRegisteredTokensWithMarkets) String() string { return proto.CompactTextString(m) }
+func (*QueryRegisteredTokensWithMarkets) ProtoMessage()    {}
+func (*QueryRegisteredTokensWithMarkets) Descriptor() ([]byte, []int) {
 	return fileDescriptor_1e8137dcabb0ccc7, []int{4}
 }
-func (m *QueryRegisteredTokenMarkets) XXX_Unmarshal(b []byte) error {
+func (m *QueryRegisteredTokensWithMarkets) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *QueryRegisteredTokenMarkets) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *QueryRegisteredTokensWithMarkets) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_QueryRegisteredTokenMarkets.Marshal(b, m, deterministic)
+		return xxx_messageInfo_QueryRegisteredTokensWithMarkets.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -213,36 +213,38 @@ func (m *QueryRegisteredTokenMarkets) XXX_Marshal(b []byte, deterministic bool)
 		return b[:n], nil
 	}
 }
-func (m *QueryRegisteredTokenMarkets) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryRegisteredTokenMarkets.Merge(m, src)
+func (m *QueryRegisteredTokensWithMarkets) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryRegisteredTokensWithMarkets.Merge(m, src)
 }
-func (m *QueryRegisteredTokenMarkets) XXX_Size() int {
+func (m *QueryRegisteredTokensWithMarkets) XXX_Size() int {
 	return m.Size()
 }
-func (m *QueryRegisteredTokenMarkets) XXX_DiscardUnknown() {
-	xxx_messageInfo_QueryRegisteredTokenMarkets.DiscardUnknown(m)
+func (m *QueryRegisteredTokensWithMarkets) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryRegisteredTokensWithMarkets.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_QueryRegisteredTokenMarkets proto.InternalMessageInfo
+var xxx_messageInfo_QueryRegisteredTokensWithMarkets proto.InternalMessageInfo
 
-// QueryRegisteredTokenMarketsResponse defines the response structure for the
-// RegisteredTokenMarkets gRPC service handler.
-type QueryRegisteredTokenMarketsResponse struct {
+// QueryRegisteredTokensWithMarketsResponse defines the response structure for the
+// RegisteredTokensWithMarkets gRPC service handler.
+type QueryRegisteredTokensWithMarketsResponse struct {
 	Markets []TokenMarket `protobuf:"bytes,1,rep,name=markets,proto3" json:"markets"`
 }
 
-func (m *QueryRegisteredTokenMarketsResponse) Reset()         { *m = QueryRegisteredTokenMarketsResponse{} }
-func (m *QueryRegisteredTokenMarketsResponse) String() string { return proto.CompactTextString(m) }
-func (*QueryRegisteredTokenMarketsResponse) ProtoMessage()    {}
-func (*QueryRegisteredTokenMarketsResponse) Descriptor() ([]byte, []int) {
+func (m *QueryRegisteredTokensWithMarketsResponse) Reset() {
+	*m = QueryRegisteredTokensWithMarketsResponse{}
+}
+func (m *QueryRegisteredTokensWithMarketsResponse) String() string { return proto.CompactTextString(m) }
+func (*QueryRegisteredTokensWithMarketsResponse) ProtoMessage()    {}
+func (*QueryRegisteredTokensWithMarketsResponse) Descriptor() ([]byte, []int) {
 	return fileDescriptor_1e8137dcabb0ccc7, []int{5}
 }
-func (m *QueryRegisteredTokenMarketsResponse) XXX_Unmarshal(b []byte) error {
+func (m *QueryRegisteredTokensWithMarketsResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *QueryRegisteredTokenMarketsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *QueryRegisteredTokensWithMarketsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_QueryRegisteredTokenMarketsResponse.Marshal(b, m, deterministic)
+		return xxx_messageInfo_QueryRegisteredTokensWithMarketsResponse.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -252,17 +254,17 @@ func (m *QueryRegisteredTokenMarketsResponse) XXX_Marshal(b []byte, deterministi
 		return b[:n], nil
 	}
 }
-func (m *QueryRegisteredTokenMarketsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryRegisteredTokenMarketsResponse.Merge(m, src)
+func (m *QueryRegisteredTokensWithMarketsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryRegisteredTokensWithMarketsResponse.Merge(m, src)
 }
-func (m *QueryRegisteredTokenMarketsResponse) XXX_Size() int {
+func (m *QueryRegisteredTokensWithMarketsResponse) XXX_Size() int {
 	return m.Size()
 }
-func (m *QueryRegisteredTokenMarketsResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_QueryRegisteredTokenMarketsResponse.DiscardUnknown(m)
+func (m *QueryRegisteredTokensWithMarketsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryRegisteredTokensWithMarketsResponse.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_QueryRegisteredTokenMarketsResponse proto.InternalMessageInfo
+var xxx_messageInfo_QueryRegisteredTokensWithMarketsResponse proto.InternalMessageInfo
 
 // TokenMarket is a token and its market summary.
 type TokenMarket struct {
@@ -1300,8 +1302,8 @@ func init() {
 	proto.RegisterType((*QueryParamsResponse)(nil), "umee.leverage.v1.QueryParamsResponse")
 	proto.RegisterType((*QueryRegisteredTokens)(nil), "umee.leverage.v1.QueryRegisteredTokens")
 	proto.RegisterType((*QueryRegisteredTokensResponse)(nil), "umee.leverage.v1.QueryRegisteredTokensResponse")
-	proto.RegisterType((*QueryRegisteredTokenMarkets)(nil), "umee.leverage.v1.QueryRegisteredTokenMarkets")
-	proto.RegisterType((*QueryRegisteredTokenMarketsResponse)(nil), "umee.leverage.v1.QueryRegisteredTokenMarketsResponse")
+	proto.RegisterType((*QueryRegisteredTokensWithMarkets)(nil), "umee.leverage.v1.QueryRegisteredTokensWithMarkets")
+	proto.RegisterType((*QueryRegisteredTokensWithMarketsResponse)(nil), "umee.leverage.v1.QueryRegisteredTokensWithMarketsResponse")
 	proto.RegisterType((*TokenMarket)(nil), "umee.leverage.v1.TokenMarket")
 	proto.RegisterType((*QuerySpecialAssets)(nil), "umee.leverage.v1.QuerySpecialAssets")
 	proto.RegisterType((*QuerySpecialAssetsResponse)(nil), "umee.leverage.v1.QuerySpecialAssetsResponse")
@@ -1331,131 +1333,131 @@ func init() {
 func init() { proto.RegisterFile("umee/leverage/v1/query.proto", fileDescriptor_1e8137dcabb0ccc7) }
 
 var fileDescriptor_1e8137dcabb0ccc7 = []byte{
-	// 1980 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0xcd, 0x6f, 0x1b, 0xc7,
-	0x15, 0xf7, 0x4a, 0x16, 0x45, 0x3d, 0x8a, 0x92, 0x3c, 0x96, 0xe5, 0x35, 0x2d, 0x91, 0xf2, 0xda,
-	0xb2, 0x15, 0xc7, 0x22, 0xfd, 0x81, 0x1a, 0x08, 0xfa, 0x69, 0x5a, 0x2d, 0xea, 0xc0, 0x09, 0xe4,
-	0x75, 0x9c, 0xc2, 0x49, 0x1b, 0x62, 0xb8, 0x3b, 0xa6, 0x16, 0x5a, 0xee, 0xd2, 0x3b, 0x4b, 0x59,
-	0x2c, 0x90, 0x4b, 0x80, 0xde, 0xda, 0xa2, 0x41, 0xd1, 0x43, 0x8f, 0xbd, 0xf6, 0xd6, 0xfe, 0x11,
-	0x85, 0x8f, 0x01, 0x7a, 0x29, 0x0a, 0x54, 0x6d, 0xed, 0xa2, 0x87, 0x5c, 0xfa, 0x0f, 0xf4, 0x50,
-	0xcc, 0x27, 0x97, 0x5c, 0x52, 0xa2, 0x16, 0xd5, 0x49, 0x9c, 0x9d, 0xf7, 0x7e, 0xef, 0x37, 0x6f,
-	0xe6, 0x7d, 0xcc, 0x08, 0x56, 0xbb, 0x6d, 0x42, 0x6a, 0x3e, 0xd9, 0x27, 0x11, 0x6e, 0x91, 0xda,
-	0xfe, 0x9d, 0xda, 0xcb, 0x2e, 0x89, 0x7a, 0xd5, 0x4e, 0x14, 0xc6, 0x21, 0x5a, 0x62, 0xb3, 0x55,
-	0x35, 0x5b, 0xdd, 0xbf, 0x53, 0x5a, 0x6d, 0x85, 0x61, 0xcb, 0x27, 0x35, 0xdc, 0xf1, 0x6a, 0x38,
-	0x08, 0xc2, 0x18, 0xc7, 0x5e, 0x18, 0x50, 0x21, 0x5f, 0x2a, 0xa7, 0xd0, 0x5a, 0x24, 0x20, 0xd4,
-	0x53, 0xf3, 0x95, 0xd4, 0xbc, 0xc6, 0x16, 0x02, 0xcb, 0xad, 0xb0, 0x15, 0xf2, 0x9f, 0x35, 0xf6,
-	0x4b, 0xc1, 0x3a, 0x21, 0x6d, 0x87, 0xb4, 0xd6, 0xc4, 0x94, 0x29, 0x35, 0x49, 0x8c, 0xef, 0xd4,
-	0x9c, 0xd0, 0x0b, 0xc4, 0xbc, 0x55, 0x84, 0xc2, 0x13, 0xc6, 0x7a, 0x07, 0x47, 0xb8, 0x4d, 0xad,
-	0x0f, 0xe0, 0x7c, 0x62, 0x68, 0x13, 0xda, 0x09, 0x03, 0x4a, 0xd0, 0x7d, 0xc8, 0x75, 0xf8, 0x17,
-	0xd3, 0x58, 0x37, 0x36, 0x0b, 0x77, 0xcd, 0xea, 0xf0, 0xea, 0xaa, 0x42, 0xa3, 0x7e, 0xf6, 0xf5,
-	0x61, 0xe5, 0x8c, 0x2d, 0xa5, 0xad, 0xfb, 0x70, 0x81, 0xc3, 0xd9, 0xa4, 0xe5, 0xd1, 0x98, 0x44,
-	0xc4, 0xfd, 0x28, 0xdc, 0x23, 0x01, 0x45, 0x6b, 0x00, 0x8c, 0x51, 0xc3, 0x25, 0x41, 0xd8, 0xe6,
-	0xa0, 0x73, 0xf6, 0x1c, 0xfb, 0xb2, 0xcd, 0x3e, 0x58, 0x9f, 0xc0, 0xda, 0x48, 0x3d, 0x4d, 0xe8,
-	0x3d, 0xc8, 0x47, 0x7c, 0x2e, 0xea, 0x99, 0xc6, 0xfa, 0xf4, 0x66, 0xe1, 0xee, 0xc5, 0x34, 0x25,
-	0xae, 0x23, 0x19, 0x69, 0x71, 0x6b, 0x0d, 0x2e, 0x8f, 0xc2, 0xfe, 0x00, 0x47, 0x7b, 0x24, 0xa6,
-	0x96, 0x0b, 0x57, 0x8f, 0x98, 0xd6, 0x04, 0xbe, 0x0d, 0xb3, 0x6d, 0xf1, 0x49, 0xda, 0x5f, 0x1b,
-	0x63, 0x5f, 0x28, 0x4a, 0x16, 0x4a, 0xc7, 0xfa, 0xa5, 0x01, 0x85, 0xc4, 0x34, 0xba, 0x07, 0x33,
-	0x31, 0x1b, 0x4a, 0xff, 0x1e, 0xb3, 0x18, 0x21, 0x8b, 0xde, 0x87, 0x9c, 0xc0, 0x33, 0xa7, 0xb8,
-	0xd6, 0xad, 0xb4, 0x16, 0x5f, 0x8a, 0xb0, 0xf1, 0xb4, 0xdb, 0x6e, 0x63, 0xb6, 0x2e, 0xb1, 0x02,
-	0xb5, 0x53, 0x02, 0xc1, 0xba, 0x09, 0x88, 0xcb, 0x3e, 0xed, 0x10, 0xc7, 0xc3, 0xfe, 0x03, 0x4a,
-	0x49, 0x4c, 0xd1, 0x32, 0xcc, 0x24, 0x77, 0x48, 0x0c, 0xac, 0x1f, 0x43, 0x29, 0x2d, 0xab, 0x3d,
-	0xf3, 0x1d, 0x98, 0xe9, 0x60, 0x2f, 0x52, 0x7e, 0xb1, 0xd2, 0xa4, 0x92, 0x7a, 0x3b, 0xd8, 0x8b,
-	0xd4, 0xaa, 0xb8, 0x9a, 0x66, 0x32, 0xc0, 0x7a, 0x0c, 0x93, 0xff, 0xce, 0x4b, 0x2a, 0x23, 0x97,
-	0x88, 0xae, 0xc0, 0x3c, 0xed, 0xb5, 0x9b, 0xa1, 0x3f, 0x70, 0xce, 0x0a, 0xe2, 0x1b, 0x3f, 0x69,
-	0xa8, 0x04, 0x79, 0x72, 0xd0, 0x09, 0x03, 0x12, 0x08, 0x2f, 0x16, 0x6d, 0x3d, 0x46, 0x4f, 0x60,
-	0x3e, 0x8c, 0xb0, 0xe3, 0x93, 0x46, 0x27, 0xf2, 0x1c, 0x62, 0x4e, 0x33, 0xf5, 0x7a, 0xf5, 0xf5,
-	0x61, 0xc5, 0xf8, 0xeb, 0x61, 0xe5, 0x7a, 0xcb, 0x8b, 0x77, 0xbb, 0xcd, 0xaa, 0x13, 0xb6, 0x6b,
-	0x32, 0xc8, 0xc4, 0x9f, 0x2d, 0xea, 0xee, 0xd5, 0xe2, 0x5e, 0x87, 0xd0, 0xea, 0x36, 0x71, 0xec,
-	0x82, 0xc0, 0xd8, 0x61, 0x10, 0xe8, 0x00, 0x96, 0xbb, 0x7c, 0x27, 0x1b, 0xe4, 0xc0, 0xd9, 0xc5,
-	0x41, 0x8b, 0x34, 0x22, 0x1c, 0x13, 0xf3, 0x2c, 0x87, 0xfe, 0x01, 0xf3, 0xc3, 0xe4, 0xd0, 0x5f,
-	0x1f, 0x56, 0x96, 0xbb, 0x71, 0x1a, 0xcd, 0x46, 0xc2, 0xc6, 0xf7, 0xe5, 0x47, 0x1b, 0xc7, 0x04,
-	0x7d, 0x0a, 0x40, 0xbb, 0x9d, 0x8e, 0xdf, 0x6b, 0x3c, 0xd8, 0x79, 0x6e, 0xce, 0x70, 0x7b, 0xdf,
-	0x3a, 0xb1, 0x3d, 0x85, 0x81, 0x3b, 0x3d, 0x7b, 0x4e, 0xfc, 0x7e, 0xb0, 0xf3, 0x9c, 0x81, 0x37,
-	0xc3, 0x28, 0x0a, 0x5f, 0x71, 0xf0, 0x5c, 0x56, 0x70, 0x89, 0xc1, 0xc1, 0xc5, 0x6f, 0x06, 0xfe,
-	0x3e, 0xe4, 0xb9, 0x25, 0x8f, 0xb8, 0xe6, 0xac, 0xde, 0x82, 0x49, 0xa1, 0x1f, 0x05, 0xb1, 0xad,
-	0xf5, 0x19, 0x56, 0x44, 0x28, 0x89, 0xf6, 0x89, 0x6b, 0xe6, 0xb3, 0x61, 0x29, 0x7d, 0xf4, 0x21,
-	0x80, 0x13, 0xfa, 0x3e, 0x8e, 0x49, 0x84, 0x7d, 0x73, 0x2e, 0x13, 0x5a, 0x02, 0x81, 0x71, 0x13,
-	0x8b, 0x26, 0xae, 0x09, 0xd9, 0xb8, 0x29, 0x7d, 0xf4, 0x18, 0xe6, 0x7c, 0xef, 0x65, 0xd7, 0x73,
-	0xbd, 0xb8, 0x67, 0x16, 0x32, 0x81, 0xf5, 0x01, 0xd0, 0x33, 0x58, 0x68, 0xe3, 0x03, 0xaf, 0xdd,
-	0x6d, 0x37, 0x84, 0x05, 0x73, 0x3e, 0x13, 0x64, 0x51, 0xa2, 0xd4, 0x39, 0x08, 0xfa, 0x09, 0x20,
-	0x05, 0x9b, 0x70, 0x64, 0x31, 0x13, 0xf4, 0x39, 0x89, 0xf4, 0xb0, 0xef, 0xcf, 0x4f, 0xe1, 0x5c,
-	0xdb, 0x0b, 0x38, 0x7c, 0xdf, 0x17, 0x0b, 0x99, 0xd0, 0x97, 0x24, 0xd0, 0x63, 0xed, 0x12, 0x17,
-	0x8a, 0x32, 0x90, 0x45, 0x14, 0x98, 0x8b, 0x1c, 0xf8, 0xbb, 0x27, 0x03, 0xfe, 0xfa, 0xb0, 0x52,
-	0x94, 0x11, 0x2c, 0x60, 0xec, 0x79, 0x81, 0xfa, 0x94, 0x8f, 0xd0, 0x73, 0x58, 0xc2, 0xfb, 0xd8,
-	0xf3, 0x71, 0xd3, 0x27, 0xca, 0xf5, 0x4b, 0x99, 0x56, 0xb0, 0xa8, 0x71, 0xfa, 0xce, 0xef, 0x43,
-	0xbf, 0xf2, 0xe2, 0x5d, 0x37, 0xc2, 0xaf, 0xcc, 0x73, 0xd9, 0x9c, 0xaf, 0x91, 0x7e, 0x24, 0x81,
-	0x50, 0x0b, 0x2e, 0xf6, 0xe1, 0xfb, 0xbb, 0xeb, 0xfd, 0x94, 0x98, 0x28, 0x93, 0x8d, 0x15, 0x0d,
-	0xf7, 0x30, 0x89, 0x86, 0x9a, 0x70, 0x41, 0x26, 0xe9, 0x5d, 0x8f, 0xc6, 0x61, 0xe4, 0x39, 0x32,
-	0x5b, 0x9f, 0xcf, 0x94, 0xad, 0xcf, 0x0b, 0xb0, 0x1f, 0x4a, 0x2c, 0x91, 0xb5, 0x57, 0x20, 0x47,
-	0xa2, 0x28, 0x8c, 0xa8, 0xb9, 0xcc, 0x2b, 0x88, 0x1c, 0x59, 0xb7, 0x61, 0x99, 0x57, 0x9f, 0x07,
-	0x8e, 0x13, 0x76, 0x83, 0xb8, 0x8e, 0x7d, 0x1c, 0x38, 0x84, 0x22, 0x13, 0x66, 0xb1, 0xeb, 0x46,
-	0x84, 0x52, 0x59, 0x72, 0xd4, 0xd0, 0xfa, 0xdb, 0x14, 0xac, 0x8e, 0x52, 0xd1, 0x25, 0xab, 0x95,
-	0x48, 0x76, 0xa2, 0x80, 0x5e, 0xaa, 0x0a, 0xa2, 0x55, 0xd6, 0x1e, 0x55, 0x65, 0x0b, 0x57, 0x7d,
-	0x18, 0x7a, 0x41, 0xfd, 0x36, 0xf3, 0xe1, 0xef, 0xff, 0x5e, 0xd9, 0x9c, 0x60, 0x71, 0x4c, 0x81,
-	0x26, 0x32, 0xe1, 0xde, 0x40, 0xf6, 0x9a, 0xfa, 0xff, 0x9b, 0x4a, 0xa6, 0xb6, 0x56, 0x22, 0xb5,
-	0x4d, 0x9f, 0xc2, 0xaa, 0x14, 0xb8, 0x55, 0x93, 0xfd, 0xab, 0x74, 0xaf, 0xea, 0x1e, 0xc6, 0x6f,
-	0xc8, 0x17, 0x39, 0xd9, 0x0e, 0x0e, 0x6a, 0xe8, 0xfd, 0x78, 0x06, 0x0b, 0xca, 0x65, 0x8d, 0x7d,
-	0xec, 0x77, 0x89, 0x00, 0x38, 0xd1, 0xf1, 0x65, 0xe7, 0xaa, 0xa8, 0x50, 0x3e, 0x66, 0x20, 0x2c,
-	0xb0, 0xfb, 0xee, 0x91, 0xc0, 0x53, 0x99, 0x80, 0x17, 0xfb, 0x38, 0x02, 0xfa, 0x19, 0x2c, 0x28,
-	0x77, 0x48, 0xe0, 0xe9, 0x6c, 0x8c, 0x15, 0x8a, 0x80, 0x7d, 0x02, 0xf3, 0xb2, 0x3c, 0xfb, 0x5e,
-	0xdb, 0x8b, 0x65, 0xc7, 0x72, 0xe2, 0x66, 0x48, 0x60, 0x3c, 0x66, 0x10, 0xc8, 0x81, 0x0b, 0x22,
-	0x31, 0xf3, 0x8b, 0x50, 0x23, 0xde, 0x8d, 0x08, 0xdd, 0x0d, 0x7d, 0x57, 0x76, 0x27, 0x27, 0xc5,
-	0x5e, 0x4e, 0x80, 0x7d, 0xa4, 0xb0, 0xd0, 0x67, 0x70, 0x9e, 0x76, 0xc2, 0xb8, 0x31, 0xb4, 0x8b,
-	0xb9, 0x4c, 0x3e, 0x39, 0xc7, 0xa0, 0x9e, 0x0e, 0xec, 0x64, 0x13, 0x2e, 0x70, 0xfc, 0xd4, 0x76,
-	0xce, 0x66, 0xb2, 0xc0, 0xc9, 0x3e, 0x1c, 0xda, 0x52, 0xb5, 0x86, 0xa1, 0x7d, 0xcd, 0x67, 0x5f,
-	0x43, 0x3d, 0xb9, 0xb7, 0xd6, 0x25, 0xb8, 0xc8, 0x63, 0xe0, 0x71, 0xc2, 0x81, 0x38, 0x6a, 0xb1,
-	0x8b, 0xca, 0x37, 0xa1, 0x32, 0x66, 0x4a, 0x87, 0x88, 0x09, 0xb3, 0xb1, 0xf8, 0xc4, 0x33, 0xd6,
-	0x9c, 0xad, 0x86, 0xd6, 0x22, 0x14, 0xb9, 0x72, 0x1d, 0xbb, 0xdb, 0xa4, 0x19, 0x53, 0xcb, 0x96,
-	0xf7, 0x41, 0xf5, 0x21, 0x71, 0x9f, 0x1b, 0xc0, 0x60, 0xf9, 0x21, 0x75, 0x6d, 0x90, 0x4a, 0xea,
-	0x2a, 0xa5, 0x8c, 0xd4, 0x61, 0x49, 0x5e, 0x01, 0x0e, 0x74, 0xf5, 0x19, 0x1b, 0xef, 0xfd, 0x7b,
-	0xc4, 0x54, 0xf2, 0x1e, 0xf1, 0x6f, 0x03, 0xcc, 0x61, 0x10, 0xcd, 0x8d, 0xc0, 0xac, 0x28, 0xca,
-	0xf4, 0x34, 0x32, 0xb2, 0xc2, 0x46, 0x0e, 0xe4, 0x62, 0x61, 0xe5, 0x14, 0x92, 0xb1, 0x84, 0xb6,
-	0xbe, 0x07, 0x0b, 0x6a, 0x9d, 0xb2, 0x0f, 0x38, 0xa9, 0xab, 0x3e, 0x87, 0x95, 0x41, 0x04, 0xed,
-	0xa7, 0xfe, 0x02, 0x8c, 0xd3, 0x5b, 0xc0, 0xcf, 0x0d, 0x98, 0xe7, 0xf6, 0x1f, 0x05, 0xb4, 0x43,
-	0x9c, 0x98, 0xd5, 0x66, 0x71, 0x9f, 0x93, 0xf4, 0xe5, 0x88, 0x5d, 0xec, 0x74, 0xc9, 0x61, 0x0b,
-	0x30, 0x12, 0xdd, 0x71, 0x79, 0xa0, 0xf6, 0x4d, 0xf3, 0xd9, 0x64, 0xb9, 0x5a, 0x81, 0x9c, 0xcb,
-	0x2e, 0x4e, 0x11, 0xcf, 0x72, 0x86, 0x2d, 0x47, 0x68, 0x09, 0xa6, 0xfd, 0x78, 0x9f, 0xa7, 0x27,
-	0xc3, 0x66, 0x3f, 0x75, 0xbd, 0x91, 0x6c, 0x64, 0x11, 0x39, 0xa2, 0xde, 0x1c, 0xc8, 0x96, 0x41,
-	0x2a, 0x68, 0xe7, 0x6d, 0x83, 0xbc, 0xf1, 0x10, 0x7d, 0x73, 0x5e, 0x4f, 0x87, 0xc0, 0xa0, 0x19,
-	0x19, 0x09, 0x7d, 0x45, 0xb6, 0xe8, 0x17, 0xd8, 0xf3, 0xbb, 0x11, 0x11, 0xa7, 0x68, 0xce, 0xd6,
-	0x63, 0x0b, 0xcb, 0x42, 0x37, 0x88, 0xa1, 0x09, 0xd4, 0xb5, 0xbf, 0x22, 0xf9, 0x08, 0x31, 0xa9,
-	0x7d, 0xad, 0x67, 0xfd, 0xc1, 0x80, 0x85, 0x49, 0x3d, 0x81, 0xee, 0x43, 0x1e, 0x07, 0xd8, 0xef,
-	0x51, 0x8f, 0xca, 0xf7, 0x8b, 0x52, 0xda, 0xa0, 0xed, 0xd1, 0xbd, 0x47, 0xc1, 0x8b, 0xd0, 0xd6,
-	0xb2, 0xe8, 0x3d, 0xc8, 0x77, 0x42, 0xea, 0xb1, 0x4c, 0xc4, 0xb7, 0x6e, 0xe4, 0xd3, 0xcb, 0x36,
-	0x71, 0x74, 0x6b, 0xa5, 0xc5, 0x11, 0x82, 0xb3, 0x5e, 0xf0, 0x22, 0x14, 0xb5, 0xcb, 0xe6, 0xbf,
-	0xad, 0xcf, 0x20, 0xaf, 0x8c, 0x30, 0xf7, 0xa9, 0xc4, 0xc8, 0xd9, 0x1a, 0xb6, 0x1e, 0xa3, 0x75,
-	0x28, 0x24, 0x72, 0xa0, 0x3c, 0x52, 0xc9, 0x4f, 0x2c, 0x5e, 0x3e, 0xd6, 0xf5, 0xd6, 0xb0, 0xc5,
-	0xc0, 0xfa, 0x8f, 0x01, 0x85, 0x04, 0x1b, 0xf4, 0x72, 0xe0, 0xec, 0x89, 0x9d, 0x5e, 0x1d, 0x19,
-	0x29, 0xdb, 0xc4, 0xe1, 0xc1, 0x72, 0x4f, 0x06, 0xcb, 0xbb, 0x93, 0x25, 0xf8, 0x74, 0xf7, 0xd5,
-	0x1e, 0x08, 0x85, 0x53, 0x32, 0xa8, 0x4d, 0xdc, 0xfd, 0xd3, 0x02, 0xcc, 0xf0, 0x93, 0x86, 0x3a,
-	0x90, 0x13, 0xcf, 0x82, 0x68, 0x6d, 0xcc, 0xd3, 0x94, 0x98, 0x2e, 0x6d, 0x1c, 0x39, 0xad, 0xce,
-	0xa8, 0xb5, 0xfe, 0xc5, 0x9f, 0xff, 0xf5, 0xeb, 0xa9, 0x12, 0x32, 0x6b, 0xa9, 0xc7, 0x50, 0xf1,
-	0xe0, 0x88, 0x7e, 0x6b, 0xc0, 0x52, 0xea, 0xb1, 0xf1, 0xc6, 0x18, 0xf4, 0x61, 0xc1, 0x52, 0x6d,
-	0x42, 0x41, 0x4d, 0xe8, 0x5d, 0x4e, 0x68, 0x03, 0x5d, 0x4d, 0x13, 0x8a, 0xb4, 0x4e, 0x43, 0xa4,
-	0x2e, 0xf4, 0x47, 0x03, 0x56, 0x46, 0xbf, 0x2a, 0xa2, 0xad, 0xc9, 0x0c, 0x4b, 0xf1, 0xd2, 0x37,
-	0x4e, 0x24, 0xae, 0xd9, 0xde, 0xe5, 0x6c, 0x6f, 0xa1, 0x9b, 0xc7, 0xb3, 0x6d, 0xc8, 0x87, 0x4a,
-	0xf4, 0x0b, 0x03, 0x8a, 0x83, 0x6f, 0x82, 0xd7, 0xc6, 0x18, 0x1f, 0x90, 0x2a, 0xdd, 0x9a, 0x44,
-	0x4a, 0x33, 0xdb, 0xe4, 0xcc, 0x2c, 0xb4, 0x9e, 0x66, 0x46, 0x85, 0x42, 0x03, 0x0b, 0xeb, 0x8c,
-	0xcf, 0xe0, 0xcb, 0xe0, 0xb5, 0x49, 0x5e, 0x3d, 0x4b, 0x27, 0x7a, 0x1b, 0x3d, 0x8a, 0x8f, 0x70,
-	0x4c, 0x83, 0x4a, 0xeb, 0xbf, 0x31, 0x60, 0x71, 0xf8, 0xfa, 0x77, 0x7d, 0x8c, 0xad, 0x21, 0xb9,
-	0x52, 0x75, 0x32, 0x39, 0xcd, 0xea, 0x26, 0x67, 0x75, 0x0d, 0x59, 0x69, 0x56, 0x58, 0xa8, 0x34,
-	0x9a, 0x8a, 0xc3, 0x97, 0x06, 0x2c, 0x0c, 0x5d, 0x82, 0x36, 0x8e, 0x36, 0xa7, 0x3c, 0xb5, 0x35,
-	0x91, 0x98, 0x26, 0xf5, 0x0e, 0x27, 0x75, 0x15, 0x5d, 0x19, 0x4f, 0x4a, 0xf9, 0xea, 0x77, 0x06,
-	0xa0, 0x74, 0x1f, 0x89, 0xde, 0x19, 0x63, 0x30, 0x2d, 0x5a, 0xba, 0x33, 0xb1, 0xa8, 0xe6, 0xb7,
-	0xc5, 0xf9, 0xdd, 0x40, 0x1b, 0x69, 0x7e, 0x03, 0x97, 0x0f, 0x49, 0xa6, 0x07, 0x79, 0xd5, 0x9c,
-	0xa2, 0xca, 0x18, 0x6b, 0x4a, 0xa0, 0x74, 0xe3, 0x18, 0x01, 0x4d, 0xe2, 0x2a, 0x27, 0xb1, 0x86,
-	0x2e, 0xa7, 0x49, 0x34, 0xb1, 0xdb, 0x70, 0xb9, 0xb9, 0x9f, 0x19, 0x50, 0x48, 0x36, 0xb1, 0xd6,
-	0xd8, 0x23, 0xab, 0x65, 0x4a, 0x37, 0x8f, 0x97, 0xd1, 0x24, 0xae, 0x73, 0x12, 0xeb, 0xa8, 0x3c,
-	0xea, 0x50, 0x1f, 0xe8, 0x37, 0x20, 0xf4, 0x39, 0xcc, 0xf5, 0xdb, 0xc3, 0xf5, 0xf1, 0x06, 0x84,
-	0x44, 0x69, 0xf3, 0x38, 0x09, 0x4d, 0xe0, 0x1a, 0x27, 0x50, 0x46, 0xab, 0xa3, 0x09, 0x88, 0x02,
-	0x82, 0x62, 0x98, 0x55, 0xbd, 0x5d, 0x79, 0x0c, 0xb4, 0x9c, 0x2f, 0x5d, 0x3f, 0x7a, 0x5e, 0x1b,
-	0xbe, 0xc2, 0x0d, 0x5f, 0x46, 0x97, 0xd2, 0x86, 0x3d, 0x69, 0xea, 0xcb, 0x74, 0xeb, 0xb2, 0x71,
-	0x34, 0xba, 0x14, 0x1b, 0x1b, 0x2f, 0xa3, 0xfb, 0xac, 0xa3, 0xe2, 0x45, 0x72, 0xd9, 0x92, 0x71,
-	0x53, 0xff, 0xf0, 0xf5, 0x3f, 0xcb, 0x67, 0x5e, 0xbf, 0x29, 0x1b, 0x5f, 0xbd, 0x29, 0x1b, 0xff,
-	0x78, 0x53, 0x36, 0x7e, 0xf5, 0xb6, 0x7c, 0xe6, 0xab, 0xb7, 0xe5, 0x33, 0x7f, 0x79, 0x5b, 0x3e,
-	0xf3, 0xc9, 0xed, 0x44, 0x75, 0x66, 0x50, 0x5b, 0x01, 0x89, 0x5f, 0x85, 0xd1, 0x9e, 0xc0, 0xdd,
-	0xbf, 0x5f, 0x3b, 0xe8, 0x83, 0xf3, 0x5a, 0xdd, 0xcc, 0xf1, 0x7f, 0xf9, 0xdd, 0xfb, 0x5f, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0xf8, 0xd1, 0x13, 0x3d, 0xb9, 0x1c, 0x00, 0x00,
+	// 1984 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x99, 0xcf, 0x6f, 0x1b, 0xc7,
+	0x15, 0xc7, 0xb5, 0x92, 0x45, 0x51, 0x8f, 0xa2, 0x24, 0x8f, 0x65, 0x7b, 0x4d, 0x4b, 0x24, 0xbd,
+	0xb6, 0x6c, 0xc5, 0x89, 0x48, 0x5b, 0x06, 0x8c, 0xa6, 0xbf, 0x4d, 0xab, 0x45, 0x1d, 0x38, 0x81,
+	0xbc, 0x8e, 0x13, 0x38, 0x69, 0x43, 0x0c, 0x97, 0x63, 0x6a, 0xa1, 0xe5, 0x2e, 0xbd, 0xb3, 0x94,
+	0xc5, 0x02, 0xb9, 0x04, 0xe8, 0xad, 0x2d, 0x1a, 0x14, 0x3d, 0xf4, 0xd8, 0x6b, 0x6f, 0xfd, 0x2b,
+	0xaa, 0x63, 0x80, 0x5e, 0x8a, 0x16, 0x55, 0x5b, 0xbb, 0xe8, 0x21, 0x97, 0xfe, 0x03, 0x3d, 0x14,
+	0xf3, 0x93, 0x4b, 0x2e, 0x29, 0x51, 0x8b, 0xea, 0x24, 0xce, 0xce, 0x7b, 0x9f, 0xf7, 0x9d, 0x37,
+	0xbf, 0x47, 0xb0, 0xda, 0x6d, 0x13, 0x52, 0xf5, 0xc8, 0x3e, 0x09, 0x71, 0x8b, 0x54, 0xf7, 0xef,
+	0x56, 0x5f, 0x76, 0x49, 0xd8, 0xab, 0x74, 0xc2, 0x20, 0x0a, 0xd0, 0x32, 0xab, 0xad, 0xa8, 0xda,
+	0xca, 0xfe, 0xdd, 0xc2, 0x6a, 0x2b, 0x08, 0x5a, 0x1e, 0xa9, 0xe2, 0x8e, 0x5b, 0xc5, 0xbe, 0x1f,
+	0x44, 0x38, 0x72, 0x03, 0x9f, 0x0a, 0xfb, 0x42, 0x31, 0x41, 0x6b, 0x11, 0x9f, 0x50, 0x57, 0xd5,
+	0x97, 0x12, 0xf5, 0x9a, 0x2d, 0x0c, 0x56, 0x5a, 0x41, 0x2b, 0xe0, 0x3f, 0xab, 0xec, 0x97, 0xc2,
+	0x3a, 0x01, 0x6d, 0x07, 0xb4, 0xda, 0xc0, 0x94, 0x39, 0x35, 0x48, 0x84, 0xef, 0x56, 0x9d, 0xc0,
+	0xf5, 0x45, 0xbd, 0x95, 0x87, 0xdc, 0x13, 0xa6, 0x7a, 0x07, 0x87, 0xb8, 0x4d, 0xad, 0xf7, 0xe1,
+	0x42, 0xac, 0x68, 0x13, 0xda, 0x09, 0x7c, 0x4a, 0xd0, 0x7d, 0xc8, 0x74, 0xf8, 0x17, 0xd3, 0x28,
+	0x1b, 0x1b, 0xb9, 0x2d, 0xb3, 0x32, 0xdc, 0xba, 0x8a, 0xf0, 0xa8, 0x9d, 0x3b, 0x3c, 0x2a, 0x4d,
+	0xd9, 0xd2, 0xda, 0xba, 0x0f, 0x17, 0x39, 0xce, 0x26, 0x2d, 0x97, 0x46, 0x24, 0x24, 0xcd, 0x0f,
+	0x83, 0x3d, 0xe2, 0x53, 0xb4, 0x06, 0xc0, 0x14, 0xd5, 0x9b, 0xc4, 0x0f, 0xda, 0x1c, 0x3a, 0x6f,
+	0xcf, 0xb3, 0x2f, 0xdb, 0xec, 0x83, 0xf5, 0x09, 0xac, 0x8d, 0xf4, 0xd3, 0x82, 0xde, 0x85, 0x6c,
+	0xc8, 0xeb, 0xc2, 0x9e, 0x69, 0x94, 0x67, 0x36, 0x72, 0x5b, 0x97, 0x93, 0x92, 0xb8, 0x8f, 0x54,
+	0xa4, 0xcd, 0x2d, 0x0b, 0xca, 0x23, 0xd9, 0x1f, 0xbb, 0xd1, 0xee, 0xfb, 0x38, 0xdc, 0x23, 0x11,
+	0xb5, 0x5c, 0xd8, 0x38, 0xc9, 0x46, 0x4b, 0xf9, 0x0e, 0xcc, 0xb5, 0xc5, 0x27, 0xa9, 0x64, 0x6d,
+	0x8c, 0x12, 0xe1, 0x28, 0xf5, 0x28, 0x1f, 0xeb, 0x97, 0x06, 0xe4, 0x62, 0xd5, 0xe8, 0x1e, 0xcc,
+	0x46, 0xac, 0x28, 0x33, 0x7d, 0x42, 0xb3, 0x84, 0x2d, 0x7a, 0x0f, 0x32, 0x82, 0x67, 0x4e, 0x73,
+	0xaf, 0x77, 0x92, 0x5e, 0xbc, 0x3d, 0x22, 0xc6, 0xd3, 0x6e, 0xbb, 0x8d, 0x59, 0xe3, 0x44, 0x0b,
+	0x54, 0x9f, 0x09, 0x82, 0x75, 0x1b, 0x10, 0xb7, 0x7d, 0xda, 0x21, 0x8e, 0x8b, 0xbd, 0x07, 0x94,
+	0x92, 0x88, 0xa2, 0x15, 0x98, 0x8d, 0xf7, 0x95, 0x28, 0x58, 0x3f, 0x86, 0x42, 0xd2, 0x56, 0x67,
+	0xe6, 0xbb, 0x30, 0xdb, 0xc1, 0x6e, 0xa8, 0xf2, 0x62, 0x25, 0x45, 0xc5, 0xfd, 0x76, 0xb0, 0x1b,
+	0xaa, 0x56, 0x71, 0x37, 0xad, 0x64, 0x40, 0xf5, 0x18, 0x25, 0xff, 0x5d, 0x90, 0x52, 0x46, 0x36,
+	0x11, 0x5d, 0x83, 0x05, 0xda, 0x6b, 0x37, 0x02, 0x6f, 0x60, 0xc4, 0xe5, 0xc4, 0x37, 0x3e, 0xe6,
+	0x50, 0x01, 0xb2, 0xe4, 0xa0, 0x13, 0xf8, 0xc4, 0x17, 0x59, 0xcc, 0xdb, 0xba, 0x8c, 0x9e, 0xc0,
+	0x42, 0x10, 0x62, 0xc7, 0x23, 0xf5, 0x4e, 0xe8, 0x3a, 0xc4, 0x9c, 0x61, 0xee, 0xb5, 0xca, 0xe1,
+	0x51, 0xc9, 0xf8, 0xcb, 0x51, 0xe9, 0x66, 0xcb, 0x8d, 0x76, 0xbb, 0x8d, 0x8a, 0x13, 0xb4, 0xab,
+	0x72, 0xba, 0x89, 0x3f, 0x9b, 0xb4, 0xb9, 0x57, 0x8d, 0x7a, 0x1d, 0x42, 0x2b, 0xdb, 0xc4, 0xb1,
+	0x73, 0x82, 0xb1, 0xc3, 0x10, 0xe8, 0x00, 0x56, 0xba, 0xbc, 0x27, 0xeb, 0xe4, 0xc0, 0xd9, 0xc5,
+	0x7e, 0x8b, 0xd4, 0x43, 0x1c, 0x11, 0xf3, 0x1c, 0x47, 0xff, 0x90, 0xe5, 0x61, 0x72, 0xf4, 0xd7,
+	0x47, 0xa5, 0x95, 0x6e, 0x94, 0xa4, 0xd9, 0x48, 0xc4, 0xf8, 0x81, 0xfc, 0x68, 0xe3, 0x88, 0xa0,
+	0x4f, 0x01, 0x68, 0xb7, 0xd3, 0xf1, 0x7a, 0xf5, 0x07, 0x3b, 0xcf, 0xcd, 0x59, 0x1e, 0xef, 0xdb,
+	0xa7, 0x8e, 0xa7, 0x18, 0xb8, 0xd3, 0xb3, 0xe7, 0xc5, 0xef, 0x07, 0x3b, 0xcf, 0x19, 0xbc, 0x11,
+	0x84, 0x61, 0xf0, 0x8a, 0xc3, 0x33, 0x69, 0xe1, 0x92, 0xc1, 0xe1, 0xe2, 0x37, 0x83, 0xbf, 0x07,
+	0x59, 0x1e, 0xc9, 0x25, 0x4d, 0x73, 0x4e, 0x77, 0xc1, 0xa4, 0xe8, 0x47, 0x7e, 0x64, 0x6b, 0x7f,
+	0xc6, 0x0a, 0x09, 0x25, 0xe1, 0x3e, 0x69, 0x9a, 0xd9, 0x74, 0x2c, 0xe5, 0x8f, 0x3e, 0x00, 0x70,
+	0x02, 0xcf, 0xc3, 0x11, 0x09, 0xb1, 0x67, 0xce, 0xa7, 0xa2, 0xc5, 0x08, 0x4c, 0x9b, 0x68, 0x34,
+	0x69, 0x9a, 0x90, 0x4e, 0x9b, 0xf2, 0x47, 0x8f, 0x61, 0xde, 0x73, 0x5f, 0x76, 0xdd, 0xa6, 0x1b,
+	0xf5, 0xcc, 0x5c, 0x2a, 0x58, 0x1f, 0x80, 0x9e, 0xc1, 0x62, 0x1b, 0x1f, 0xb8, 0xed, 0x6e, 0xbb,
+	0x2e, 0x22, 0x98, 0x0b, 0xa9, 0x90, 0x79, 0x49, 0xa9, 0x71, 0x08, 0xfa, 0x09, 0x20, 0x85, 0x8d,
+	0x25, 0x32, 0x9f, 0x0a, 0x7d, 0x5e, 0x92, 0x1e, 0xf6, 0xf3, 0xf9, 0x29, 0x9c, 0x6f, 0xbb, 0x3e,
+	0xc7, 0xf7, 0x73, 0xb1, 0x98, 0x8a, 0xbe, 0x2c, 0x41, 0x8f, 0x75, 0x4a, 0x9a, 0x90, 0x97, 0x13,
+	0x59, 0xcc, 0x02, 0x73, 0x89, 0x83, 0xbf, 0x77, 0x3a, 0xf0, 0xd7, 0x47, 0xa5, 0xbc, 0x9c, 0xc1,
+	0x02, 0x63, 0x2f, 0x08, 0xea, 0x53, 0x5e, 0x42, 0xcf, 0x61, 0x19, 0xef, 0x63, 0xd7, 0xc3, 0x0d,
+	0x8f, 0xa8, 0xd4, 0x2f, 0xa7, 0x6a, 0xc1, 0x92, 0xe6, 0xf4, 0x93, 0xdf, 0x47, 0xbf, 0x72, 0xa3,
+	0xdd, 0x66, 0x88, 0x5f, 0x99, 0xe7, 0xd3, 0x25, 0x5f, 0x93, 0x3e, 0x96, 0x20, 0xd4, 0x82, 0xcb,
+	0x7d, 0x7c, 0xbf, 0x77, 0xdd, 0x9f, 0x12, 0x13, 0xa5, 0x8a, 0x71, 0x49, 0xe3, 0x1e, 0xc6, 0x69,
+	0xa8, 0x01, 0x17, 0xe5, 0x22, 0xbd, 0xeb, 0xd2, 0x28, 0x08, 0x5d, 0x47, 0xae, 0xd6, 0x17, 0x52,
+	0xad, 0xd6, 0x17, 0x04, 0xec, 0x47, 0x92, 0x25, 0x56, 0xed, 0x4b, 0x90, 0x21, 0x61, 0x18, 0x84,
+	0xd4, 0x5c, 0xe1, 0x3b, 0x88, 0x2c, 0x59, 0x77, 0x60, 0x85, 0xef, 0x3e, 0x0f, 0x1c, 0x27, 0xe8,
+	0xfa, 0x51, 0x0d, 0x7b, 0xd8, 0x77, 0x08, 0x45, 0x26, 0xcc, 0xe1, 0x66, 0x33, 0x24, 0x94, 0xca,
+	0x2d, 0x47, 0x15, 0xad, 0xbf, 0x4d, 0xc3, 0xea, 0x28, 0x17, 0xbd, 0x65, 0xb5, 0x62, 0x8b, 0x9d,
+	0xd8, 0x40, 0xaf, 0x54, 0x84, 0xd0, 0x0a, 0x3b, 0x28, 0x55, 0xe4, 0x61, 0xae, 0xf2, 0x30, 0x70,
+	0xfd, 0xda, 0x1d, 0x96, 0xc3, 0xdf, 0xff, 0xbd, 0xb4, 0x31, 0x41, 0xe3, 0x98, 0x03, 0x8d, 0xad,
+	0x84, 0x7b, 0x03, 0xab, 0xd7, 0xf4, 0xff, 0x3f, 0x54, 0x7c, 0x69, 0x6b, 0xc5, 0x96, 0xb6, 0x99,
+	0x33, 0x68, 0x95, 0x82, 0x5b, 0x55, 0x79, 0x92, 0x95, 0xe9, 0x55, 0xa7, 0x87, 0xf1, 0x1d, 0xf2,
+	0x45, 0x06, 0xae, 0x8e, 0xf0, 0xd0, 0xfd, 0xf1, 0x0c, 0x16, 0x55, 0xca, 0xea, 0xfb, 0xd8, 0xeb,
+	0x12, 0x01, 0x38, 0xd5, 0xf0, 0x65, 0xe3, 0x2a, 0xaf, 0x28, 0x1f, 0x31, 0x08, 0x9b, 0xd8, 0xfd,
+	0xf4, 0x48, 0xf0, 0x74, 0x2a, 0xf0, 0x52, 0x9f, 0x23, 0xd0, 0xcf, 0x60, 0x51, 0xa5, 0x43, 0x82,
+	0x67, 0xd2, 0x29, 0x56, 0x14, 0x81, 0x7d, 0x02, 0x0b, 0x72, 0x7b, 0xf6, 0xdc, 0xb6, 0x1b, 0xc9,
+	0x13, 0xcb, 0xa9, 0x0f, 0x43, 0x82, 0xf1, 0x98, 0x21, 0x90, 0x03, 0x17, 0xc5, 0xc2, 0xcc, 0xaf,
+	0x44, 0xf5, 0x68, 0x37, 0x24, 0x74, 0x37, 0xf0, 0x9a, 0xf2, 0x74, 0x72, 0x5a, 0xf6, 0x4a, 0x0c,
+	0xf6, 0xa1, 0x62, 0xa1, 0xcf, 0xe0, 0x02, 0xed, 0x04, 0x51, 0x7d, 0xa8, 0x17, 0x33, 0xa9, 0x72,
+	0x72, 0x9e, 0xa1, 0x9e, 0x0e, 0xf4, 0x64, 0x03, 0x2e, 0x72, 0x7e, 0xa2, 0x3b, 0xe7, 0x52, 0x45,
+	0xe0, 0x62, 0x1f, 0x0e, 0x75, 0xa9, 0x6a, 0xc3, 0x50, 0xbf, 0x66, 0xd3, 0xb7, 0xa1, 0x16, 0xef,
+	0x5b, 0xeb, 0x0a, 0x5c, 0xe6, 0x73, 0xe0, 0x71, 0x2c, 0x81, 0x38, 0x6c, 0xb1, 0x8b, 0xca, 0xb7,
+	0xa0, 0x34, 0xa6, 0x4a, 0x4f, 0x11, 0x13, 0xe6, 0x22, 0xf1, 0x89, 0xaf, 0x58, 0xf3, 0xb6, 0x2a,
+	0x5a, 0x4b, 0x90, 0xe7, 0xce, 0x35, 0xdc, 0xdc, 0x26, 0x8d, 0x88, 0x5a, 0xb6, 0xbc, 0x19, 0xaa,
+	0x0f, 0xb1, 0x9b, 0xdd, 0x00, 0x83, 0xad, 0x0f, 0x89, 0x6b, 0x83, 0x74, 0x52, 0x57, 0x29, 0x15,
+	0xa4, 0x06, 0xcb, 0xf2, 0x0a, 0x70, 0xa0, 0x77, 0x9f, 0xb1, 0xf3, 0xbd, 0x7f, 0x8f, 0x98, 0x8e,
+	0xdf, 0x23, 0xfe, 0x6d, 0x80, 0x39, 0x0c, 0xd1, 0xda, 0x08, 0xcc, 0x89, 0x4d, 0x99, 0x9e, 0xc5,
+	0x8a, 0xac, 0xd8, 0xc8, 0x81, 0x4c, 0x24, 0xa2, 0x9c, 0xc1, 0x62, 0x2c, 0xd1, 0xd6, 0xf7, 0x61,
+	0x51, 0xb5, 0x53, 0x9e, 0x03, 0x4e, 0x9b, 0xaa, 0xcf, 0xe1, 0xd2, 0x20, 0x41, 0xe7, 0xa9, 0xdf,
+	0x00, 0xe3, 0xec, 0x1a, 0xf0, 0x73, 0x03, 0x16, 0x78, 0xfc, 0x47, 0x3e, 0xed, 0x10, 0x27, 0x62,
+	0x7b, 0xb3, 0xb8, 0xcf, 0x49, 0xf9, 0xb2, 0xc4, 0x2e, 0x76, 0x7a, 0xcb, 0x61, 0x0d, 0x30, 0x62,
+	0xa7, 0xe3, 0xe2, 0xc0, 0xde, 0x37, 0xc3, 0x6b, 0xe3, 0xdb, 0xd5, 0x25, 0xc8, 0x34, 0xd9, 0xc5,
+	0x29, 0xe4, 0xab, 0x9c, 0x61, 0xcb, 0x12, 0x5a, 0x86, 0x19, 0x2f, 0xda, 0xe7, 0xcb, 0x93, 0x61,
+	0xb3, 0x9f, 0x7a, 0xbf, 0x91, 0x6a, 0xe4, 0x26, 0x72, 0xcc, 0x7e, 0x73, 0x20, 0x8f, 0x0c, 0xd2,
+	0x41, 0x27, 0x6f, 0x1b, 0xe4, 0x8d, 0x87, 0xe8, 0x9b, 0x73, 0x39, 0x39, 0x05, 0x06, 0xc3, 0xc8,
+	0x99, 0xd0, 0x77, 0x64, 0x8d, 0x7e, 0x81, 0x5d, 0xaf, 0x1b, 0x12, 0x31, 0x8a, 0xe6, 0x6d, 0x5d,
+	0xb6, 0xb0, 0xdc, 0xe8, 0x06, 0x19, 0x5a, 0x40, 0x4d, 0xe7, 0x2b, 0x94, 0x8f, 0x10, 0x93, 0xc6,
+	0xd7, 0x7e, 0xd6, 0x1f, 0x0c, 0x58, 0x9c, 0x34, 0x13, 0xe8, 0x3e, 0x64, 0xb1, 0x8f, 0xbd, 0x1e,
+	0x75, 0xa9, 0x7c, 0xbf, 0x28, 0x24, 0x03, 0xda, 0x2e, 0xdd, 0x7b, 0xe4, 0xbf, 0x08, 0x6c, 0x6d,
+	0x8b, 0xde, 0x85, 0x6c, 0x27, 0xa0, 0x2e, 0x5b, 0x89, 0x78, 0xd7, 0x8d, 0x7c, 0x7a, 0xd9, 0x26,
+	0x8e, 0x3e, 0x5a, 0x69, 0x73, 0x84, 0xe0, 0x9c, 0xeb, 0xbf, 0x08, 0xc4, 0xde, 0x65, 0xf3, 0xdf,
+	0xd6, 0x67, 0x90, 0x55, 0x41, 0x58, 0xfa, 0xd4, 0xc2, 0xc8, 0xd5, 0x1a, 0xb6, 0x2e, 0xa3, 0x32,
+	0xe4, 0x62, 0x6b, 0xa0, 0x1c, 0x52, 0xf1, 0x4f, 0x6c, 0xbe, 0x7c, 0xa4, 0xf7, 0x5b, 0xc3, 0x16,
+	0x05, 0xeb, 0x3f, 0x06, 0xe4, 0x62, 0x6a, 0xd0, 0xcb, 0x81, 0xb1, 0x27, 0x7a, 0x7a, 0x75, 0xe4,
+	0x4c, 0xd9, 0x26, 0x0e, 0x9f, 0x2c, 0xf7, 0xe4, 0x64, 0x79, 0x7b, 0xb2, 0x05, 0x3e, 0x79, 0xfa,
+	0x6a, 0x0f, 0x4c, 0x85, 0x33, 0x0a, 0xa8, 0x43, 0x6c, 0xfd, 0x75, 0x11, 0x66, 0xf9, 0x48, 0x43,
+	0x1d, 0xc8, 0x88, 0x07, 0x42, 0xb4, 0x36, 0xe6, 0x69, 0x4a, 0x54, 0x17, 0xd6, 0x8f, 0xad, 0x56,
+	0x63, 0xd4, 0x2a, 0x7f, 0xf1, 0xa7, 0x7f, 0xfd, 0x7a, 0xba, 0x80, 0xcc, 0x6a, 0xe2, 0x59, 0x54,
+	0x3c, 0x3d, 0xa2, 0xdf, 0x1a, 0xb0, 0x9c, 0x78, 0x76, 0xbc, 0x35, 0x86, 0x3e, 0x6c, 0x58, 0xa8,
+	0x4e, 0x68, 0xa8, 0x05, 0xbd, 0xcd, 0x05, 0xad, 0xa3, 0xeb, 0x49, 0x41, 0xa1, 0xf6, 0xa9, 0x8b,
+	0xa5, 0x0b, 0xfd, 0xd1, 0x80, 0xab, 0xc7, 0x3c, 0x2d, 0xa2, 0xad, 0x09, 0xa3, 0xc7, 0x7c, 0x0a,
+	0xdf, 0x3c, 0xbd, 0x8f, 0x16, 0xff, 0x0d, 0x2e, 0x7e, 0x0b, 0xdd, 0x99, 0x40, 0x3c, 0xbf, 0x21,
+	0xd6, 0xe5, 0xeb, 0x25, 0xfa, 0x85, 0x01, 0xf9, 0xc1, 0x87, 0xc2, 0x1b, 0x63, 0x74, 0x0c, 0x58,
+	0x15, 0xde, 0x99, 0xc4, 0x4a, 0xeb, 0xdb, 0xe0, 0xfa, 0x2c, 0x54, 0x4e, 0xea, 0xa3, 0xc2, 0xa1,
+	0x8e, 0x45, 0x74, 0xa6, 0x67, 0xf0, 0xb9, 0xf0, 0xc6, 0x24, 0x4f, 0xa1, 0x85, 0x53, 0x3d, 0x98,
+	0x1e, 0xa7, 0x47, 0x24, 0xa6, 0x4e, 0x65, 0xf4, 0xdf, 0x18, 0xb0, 0x34, 0x7c, 0x27, 0xbc, 0x39,
+	0x26, 0xd6, 0x90, 0x5d, 0xa1, 0x32, 0x99, 0x9d, 0x56, 0x75, 0x9b, 0xab, 0xba, 0x81, 0xac, 0xa4,
+	0x2a, 0x2c, 0x5c, 0xea, 0x0d, 0xa5, 0xe1, 0x4b, 0x03, 0x16, 0x87, 0x6e, 0x46, 0xeb, 0xc7, 0x87,
+	0x53, 0x99, 0xda, 0x9c, 0xc8, 0x4c, 0x8b, 0x7a, 0x8b, 0x8b, 0xba, 0x8e, 0xae, 0x8d, 0x17, 0xa5,
+	0x72, 0xf5, 0x3b, 0x03, 0x50, 0xf2, 0x70, 0x89, 0xde, 0x1a, 0x13, 0x30, 0x69, 0x5a, 0xb8, 0x3b,
+	0xb1, 0xa9, 0xd6, 0xb7, 0xc9, 0xf5, 0xdd, 0x42, 0xeb, 0x49, 0x7d, 0x03, 0x37, 0x12, 0x29, 0xa6,
+	0x07, 0x59, 0x75, 0x62, 0x45, 0xa5, 0x31, 0xd1, 0x94, 0x41, 0xe1, 0xd6, 0x09, 0x06, 0x5a, 0xc4,
+	0x75, 0x2e, 0x62, 0x0d, 0x5d, 0x4d, 0x8a, 0x68, 0xe0, 0x66, 0xbd, 0xc9, 0xc3, 0xfd, 0xcc, 0x80,
+	0x5c, 0xfc, 0x64, 0x6b, 0x8d, 0x1d, 0xb2, 0xda, 0xa6, 0x70, 0xfb, 0x64, 0x1b, 0x2d, 0xe2, 0x26,
+	0x17, 0x51, 0x46, 0xc5, 0x51, 0x83, 0xfa, 0x40, 0x3f, 0x0c, 0xa1, 0xcf, 0x61, 0xbe, 0x7f, 0x66,
+	0x2c, 0x8f, 0x0f, 0x20, 0x2c, 0x0a, 0x1b, 0x27, 0x59, 0x68, 0x01, 0x37, 0xb8, 0x80, 0x22, 0x5a,
+	0x1d, 0x2d, 0x40, 0xec, 0x2a, 0x28, 0x82, 0x39, 0x75, 0xe0, 0x2b, 0x8e, 0x41, 0xcb, 0xfa, 0xc2,
+	0xcd, 0xe3, 0xeb, 0x75, 0xe0, 0x6b, 0x3c, 0xf0, 0x55, 0x74, 0x25, 0x19, 0xd8, 0x95, 0xa1, 0xbe,
+	0x4c, 0x9e, 0x67, 0xd6, 0x8f, 0xa7, 0x4b, 0xb3, 0xb1, 0xf3, 0x65, 0xf4, 0xe1, 0xeb, 0xb8, 0xf9,
+	0x22, 0xb5, 0x6c, 0xca, 0x79, 0x53, 0xfb, 0xe0, 0xf0, 0x9f, 0xc5, 0xa9, 0xc3, 0xd7, 0x45, 0xe3,
+	0xab, 0xd7, 0x45, 0xe3, 0x1f, 0xaf, 0x8b, 0xc6, 0xaf, 0xde, 0x14, 0xa7, 0xbe, 0x7a, 0x53, 0x9c,
+	0xfa, 0xf3, 0x9b, 0xe2, 0xd4, 0x27, 0x77, 0x62, 0x5b, 0x36, 0x43, 0x6d, 0xfa, 0x24, 0x7a, 0x15,
+	0x84, 0x7b, 0x82, 0xbb, 0x7f, 0xbf, 0x7a, 0xd0, 0x87, 0xf3, 0x0d, 0xbc, 0x91, 0xe1, 0xff, 0x11,
+	0xbc, 0xf7, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xab, 0x99, 0xab, 0x86, 0xd8, 0x1c, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1474,8 +1476,8 @@ type QueryClient interface {
 	Params(ctx context.Context, in *QueryParams, opts ...grpc.CallOption) (*QueryParamsResponse, error)
 	// RegisteredTokens queries for all the registered tokens.
 	RegisteredTokens(ctx context.Context, in *QueryRegisteredTokens, opts ...grpc.CallOption) (*QueryRegisteredTokensResponse, error)
-	// RegisteredTokenMarkets queries for all the registered tokens and their market summaries.
-	RegisteredTokenMarkets(ctx context.Context, in *QueryRegisteredTokenMarkets, opts ...grpc.CallOption) (*QueryRegisteredTokenMarketsResponse, error)
+	// RegisteredTokensWithMarkets queries for all the registered tokens and their market summaries.
+	RegisteredTokensWithMarkets(ctx context.Context, in *QueryRegisteredTokensWithMarkets, opts ...grpc.CallOption) (*QueryRegisteredTokensWithMarketsResponse, error)
 	// SpecialAssets queries for all special asset pairs.
 	SpecialAssets(ctx context.Context, in *QuerySpecialAssets, opts ...grpc.CallOption) (*QuerySpecialAssetsResponse, error)
 	// MarketSummary queries a base asset's current borrowing and supplying conditions.
@@ -1529,9 +1531,9 @@ func (c *queryClient) RegisteredTokens(ctx context.Context, in *QueryRegisteredT
 	return out, nil
 }
 
-func (c *queryClient) RegisteredTokenMarkets(ctx context.Context, in *QueryRegisteredTokenMarkets, opts ...grpc.CallOption) (*QueryRegisteredTokenMarketsResponse, error) {
-	out := new(QueryRegisteredTokenMarketsResponse)
-	err := c.cc.Invoke(ctx, "/umee.leverage.v1.Query/RegisteredTokenMarkets", in, out, opts...)
+func (c *queryClient) RegisteredTokensWithMarkets(ctx context.Context, in *QueryRegisteredTokensWithMarkets, opts ...grpc.CallOption) (*QueryRegisteredTokensWithMarketsResponse, error) {
+	out := new(QueryRegisteredTokensWithMarketsResponse)
+	err := c.cc.Invoke(ctx, "/umee.leverage.v1.Query/RegisteredTokensWithMarkets", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1634,8 +1636,8 @@ type QueryServer interface {
 	Params(context.Context, *QueryParams) (*QueryParamsResponse, error)
 	// RegisteredTokens queries for all the registered tokens.
 	RegisteredTokens(context.Context, *QueryRegisteredTokens) (*QueryRegisteredTokensResponse, error)
-	// RegisteredTokenMarkets queries for all the registered tokens and their market summaries.
-	RegisteredTokenMarkets(context.Context, *QueryRegisteredTokenMarkets) (*QueryRegisteredTokenMarketsResponse, error)
+	// RegisteredTokensWithMarkets queries for all the registered tokens and their market summaries.
+	RegisteredTokensWithMarkets(context.Context, *QueryRegisteredTokensWithMarkets) (*QueryRegisteredTokensWithMarketsResponse, error)
 	// SpecialAssets queries for all special asset pairs.
 	SpecialAssets(context.Context, *QuerySpecialAssets) (*QuerySpecialAssetsResponse, error)
 	// MarketSummary queries a base asset's current borrowing and supplying conditions.
@@ -1673,8 +1675,8 @@ func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParams) (
 func (*UnimplementedQueryServer) RegisteredTokens(ctx context.Context, req *QueryRegisteredTokens) (*QueryRegisteredTokensResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method RegisteredTokens not implemented")
 }
-func (*UnimplementedQueryServer) RegisteredTokenMarkets(ctx context.Context, req *QueryRegisteredTokenMarkets) (*QueryRegisteredTokenMarketsResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RegisteredTokenMarkets not implemented")
+func (*UnimplementedQueryServer) RegisteredTokensWithMarkets(ctx context.Context, req *QueryRegisteredTokensWithMarkets) (*QueryRegisteredTokensWithMarketsResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method RegisteredTokensWithMarkets not implemented")
 }
 func (*UnimplementedQueryServer) SpecialAssets(ctx context.Context, req *QuerySpecialAssets) (*QuerySpecialAssetsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SpecialAssets not implemented")
@@ -1747,20 +1749,20 @@ func _Query_RegisteredTokens_Handler(srv interface{}, ctx context.Context, dec f
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Query_RegisteredTokenMarkets_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(QueryRegisteredTokenMarkets)
+func _Query_RegisteredTokensWithMarkets_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(QueryRegisteredTokensWithMarkets)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(QueryServer).RegisteredTokenMarkets(ctx, in)
+		return srv.(QueryServer).RegisteredTokensWithMarkets(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/umee.leverage.v1.Query/RegisteredTokenMarkets",
+		FullMethod: "/umee.leverage.v1.Query/RegisteredTokensWithMarkets",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(QueryServer).RegisteredTokenMarkets(ctx, req.(*QueryRegisteredTokenMarkets))
+		return srv.(QueryServer).RegisteredTokensWithMarkets(ctx, req.(*QueryRegisteredTokensWithMarkets))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1958,8 +1960,8 @@ var _Query_serviceDesc = grpc.ServiceDesc{
 			Handler:    _Query_RegisteredTokens_Handler,
 		},
 		{
-			MethodName: "RegisteredTokenMarkets",
-			Handler:    _Query_RegisteredTokenMarkets_Handler,
+			MethodName: "RegisteredTokensWithMarkets",
+			Handler:    _Query_RegisteredTokensWithMarkets_Handler,
 		},
 		{
 			MethodName: "SpecialAssets",
@@ -2129,7 +2131,7 @@ func (m *QueryRegisteredTokensResponse) MarshalToSizedBuffer(dAtA []byte) (int,
 	return len(dAtA) - i, nil
 }
 
-func (m *QueryRegisteredTokenMarkets) Marshal() (dAtA []byte, err error) {
+func (m *QueryRegisteredTokensWithMarkets) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -2139,12 +2141,12 @@ func (m *QueryRegisteredTokenMarkets) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *QueryRegisteredTokenMarkets) MarshalTo(dAtA []byte) (int, error) {
+func (m *QueryRegisteredTokensWithMarkets) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *QueryRegisteredTokenMarkets) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *QueryRegisteredTokensWithMarkets) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -2152,7 +2154,7 @@ func (m *QueryRegisteredTokenMarkets) MarshalToSizedBuffer(dAtA []byte) (int, er
 	return len(dAtA) - i, nil
 }
 
-func (m *QueryRegisteredTokenMarketsResponse) Marshal() (dAtA []byte, err error) {
+func (m *QueryRegisteredTokensWithMarketsResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -2162,12 +2164,12 @@ func (m *QueryRegisteredTokenMarketsResponse) Marshal() (dAtA []byte, err error)
 	return dAtA[:n], nil
 }
 
-func (m *QueryRegisteredTokenMarketsResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *QueryRegisteredTokensWithMarketsResponse) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *QueryRegisteredTokenMarketsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *QueryRegisteredTokensWithMarketsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -3439,7 +3441,7 @@ func (m *QueryRegisteredTokensResponse) Size() (n int) {
 	return n
 }
 
-func (m *QueryRegisteredTokenMarkets) Size() (n int) {
+func (m *QueryRegisteredTokensWithMarkets) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -3448,7 +3450,7 @@ func (m *QueryRegisteredTokenMarkets) Size() (n int) {
 	return n
 }
 
-func (m *QueryRegisteredTokenMarketsResponse) Size() (n int) {
+func (m *QueryRegisteredTokensWithMarketsResponse) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -4214,7 +4216,7 @@ func (m *QueryRegisteredTokensResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *QueryRegisteredTokenMarkets) Unmarshal(dAtA []byte) error {
+func (m *QueryRegisteredTokensWithMarkets) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -4237,10 +4239,10 @@ func (m *QueryRegisteredTokenMarkets) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: QueryRegisteredTokenMarkets: wiretype end group for non-group")
+			return fmt.Errorf("proto: QueryRegisteredTokensWithMarkets: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QueryRegisteredTokenMarkets: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: QueryRegisteredTokensWithMarkets: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		default:
@@ -4264,7 +4266,7 @@ func (m *QueryRegisteredTokenMarkets) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *QueryRegisteredTokenMarketsResponse) Unmarshal(dAtA []byte) error {
+func (m *QueryRegisteredTokensWithMarketsResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -4287,10 +4289,10 @@ func (m *QueryRegisteredTokenMarketsResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: QueryRegisteredTokenMarketsResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: QueryRegisteredTokensWithMarketsResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QueryRegisteredTokenMarketsResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: QueryRegisteredTokensWithMarketsResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
diff --git a/x/leverage/types/query.pb.gw.go b/x/leverage/types/query.pb.gw.go
index 7a2f94aa71..1e9f7ccf3d 100644
--- a/x/leverage/types/query.pb.gw.go
+++ b/x/leverage/types/query.pb.gw.go
@@ -87,20 +87,20 @@ func local_request_Query_RegisteredTokens_0(ctx context.Context, marshaler runti
 
 }
 
-func request_Query_RegisteredTokenMarkets_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq QueryRegisteredTokenMarkets
+func request_Query_RegisteredTokensWithMarkets_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq QueryRegisteredTokensWithMarkets
 	var metadata runtime.ServerMetadata
 
-	msg, err := client.RegisteredTokenMarkets(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	msg, err := client.RegisteredTokensWithMarkets(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
 }
 
-func local_request_Query_RegisteredTokenMarkets_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq QueryRegisteredTokenMarkets
+func local_request_Query_RegisteredTokensWithMarkets_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq QueryRegisteredTokensWithMarkets
 	var metadata runtime.ServerMetadata
 
-	msg, err := server.RegisteredTokenMarkets(ctx, &protoReq)
+	msg, err := server.RegisteredTokensWithMarkets(ctx, &protoReq)
 	return msg, metadata, err
 
 }
@@ -481,7 +481,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 
 	})
 
-	mux.Handle("GET", pattern_Query_RegisteredTokenMarkets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("GET", pattern_Query_RegisteredTokensWithMarkets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
@@ -492,7 +492,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := local_request_Query_RegisteredTokenMarkets_0(rctx, inboundMarshaler, server, req, pathParams)
+		resp, md, err := local_request_Query_RegisteredTokensWithMarkets_0(rctx, inboundMarshaler, server, req, pathParams)
 		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
@@ -500,7 +500,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			return
 		}
 
-		forward_Query_RegisteredTokenMarkets_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_Query_RegisteredTokensWithMarkets_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 
 	})
 
@@ -815,7 +815,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 
 	})
 
-	mux.Handle("GET", pattern_Query_RegisteredTokenMarkets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("GET", pattern_Query_RegisteredTokensWithMarkets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
@@ -824,14 +824,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_Query_RegisteredTokenMarkets_0(rctx, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_Query_RegisteredTokensWithMarkets_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
 
-		forward_Query_RegisteredTokenMarkets_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_Query_RegisteredTokensWithMarkets_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 
 	})
 
@@ -1043,7 +1043,7 @@ var (
 
 	pattern_Query_RegisteredTokens_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"umee", "leverage", "v1", "registered_tokens"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_RegisteredTokenMarkets_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"umee", "leverage", "v1", "registered_token_markets"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_RegisteredTokensWithMarkets_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"umee", "leverage", "v1", "registered_tokens_with_markets"}, "", runtime.AssumeColonVerbOpt(false)))
 
 	pattern_Query_SpecialAssets_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"umee", "leverage", "v1", "special_assets"}, "", runtime.AssumeColonVerbOpt(false)))
 
@@ -1071,7 +1071,7 @@ var (
 
 	forward_Query_RegisteredTokens_0 = runtime.ForwardResponseMessage
 
-	forward_Query_RegisteredTokenMarkets_0 = runtime.ForwardResponseMessage
+	forward_Query_RegisteredTokensWithMarkets_0 = runtime.ForwardResponseMessage
 
 	forward_Query_SpecialAssets_0 = runtime.ForwardResponseMessage