diff --git a/v2/acl/grpc/types.pb.go b/v2/acl/grpc/types.pb.go
index bba96ad..e9932c8 100644
--- a/v2/acl/grpc/types.pb.go
+++ b/v2/acl/grpc/types.pb.go
@@ -60,29 +60,61 @@ func (Target) EnumDescriptor() ([]byte, []int) {
 	return fileDescriptor_8233b6696fb3e24f, []int{0}
 }
 
+// MatchType is an enumeration of match types.
+type MatchType int32
+
+const (
+	// Unspecified match type, default value.
+	MatchType_MATCH_TYPE_UNSPECIFIED MatchType = 0
+	// Return true if strings are equal
+	MatchType_STRING_EQUAL MatchType = 1
+	// Return true if strings are different
+	MatchType_STRING_NOT_EQUAL MatchType = 2
+)
+
+var MatchType_name = map[int32]string{
+	0: "MATCH_TYPE_UNSPECIFIED",
+	1: "STRING_EQUAL",
+	2: "STRING_NOT_EQUAL",
+}
+
+var MatchType_value = map[string]int32{
+	"MATCH_TYPE_UNSPECIFIED": 0,
+	"STRING_EQUAL":           1,
+	"STRING_NOT_EQUAL":       2,
+}
+
+func (x MatchType) String() string {
+	return proto.EnumName(MatchType_name, int32(x))
+}
+
+func (MatchType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_8233b6696fb3e24f, []int{1}
+}
+
 // Operation is an enumeration of operation types.
-type EACLRecord_Operation int32
+type Operation int32
 
 const (
 	// Unspecified operation, default value.
-	EACLRecord_OPERATION_UNSPECIFIED EACLRecord_Operation = 0
+	Operation_OPERATION_UNSPECIFIED Operation = 0
 	// Get
-	EACLRecord_GET EACLRecord_Operation = 1
+	Operation_GET Operation = 1
 	// Head
-	EACLRecord_HEAD EACLRecord_Operation = 2
+	Operation_HEAD Operation = 2
 	// Put
-	EACLRecord_PUT EACLRecord_Operation = 3
+	Operation_PUT Operation = 3
 	// Delete
-	EACLRecord_DELETE EACLRecord_Operation = 4
+	Operation_DELETE Operation = 4
 	// Search
-	EACLRecord_SEARCH EACLRecord_Operation = 5
+	Operation_SEARCH Operation = 5
 	// GetRange
-	EACLRecord_GETRANGE EACLRecord_Operation = 6
+	Operation_GETRANGE Operation = 6
 	// GetRangeHash
-	EACLRecord_GETRANGEHASH EACLRecord_Operation = 7
+	Operation_GETRANGEHASH Operation = 7
 )
 
-var EACLRecord_Operation_name = map[int32]string{
+var Operation_name = map[int32]string{
 	0: "OPERATION_UNSPECIFIED",
 	1: "GET",
 	2: "HEAD",
@@ -93,7 +125,7 @@ var EACLRecord_Operation_name = map[int32]string{
 	7: "GETRANGEHASH",
 }
 
-var EACLRecord_Operation_value = map[string]int32{
+var Operation_value = map[string]int32{
 	"OPERATION_UNSPECIFIED": 0,
 	"GET":                   1,
 	"HEAD":                  2,
@@ -104,116 +136,84 @@ var EACLRecord_Operation_value = map[string]int32{
 	"GETRANGEHASH":          7,
 }
 
-func (x EACLRecord_Operation) String() string {
-	return proto.EnumName(EACLRecord_Operation_name, int32(x))
+func (x Operation) String() string {
+	return proto.EnumName(Operation_name, int32(x))
 }
 
-func (EACLRecord_Operation) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_8233b6696fb3e24f, []int{0, 0}
+func (Operation) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_8233b6696fb3e24f, []int{2}
 }
 
 // Action is an enumeration of EACL actions.
-type EACLRecord_Action int32
+type Action int32
 
 const (
 	// Unspecified action, default value.
-	EACLRecord_ACTION_UNSPECIFIED EACLRecord_Action = 0
+	Action_ACTION_UNSPECIFIED Action = 0
 	// Allow action
-	EACLRecord_ALLOW EACLRecord_Action = 1
+	Action_ALLOW Action = 1
 	// Deny action
-	EACLRecord_DENY EACLRecord_Action = 2
+	Action_DENY Action = 2
 )
 
-var EACLRecord_Action_name = map[int32]string{
+var Action_name = map[int32]string{
 	0: "ACTION_UNSPECIFIED",
 	1: "ALLOW",
 	2: "DENY",
 }
 
-var EACLRecord_Action_value = map[string]int32{
+var Action_value = map[string]int32{
 	"ACTION_UNSPECIFIED": 0,
 	"ALLOW":              1,
 	"DENY":               2,
 }
 
-func (x EACLRecord_Action) String() string {
-	return proto.EnumName(EACLRecord_Action_name, int32(x))
+func (x Action) String() string {
+	return proto.EnumName(Action_name, int32(x))
 }
 
-func (EACLRecord_Action) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_8233b6696fb3e24f, []int{0, 1}
+func (Action) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_8233b6696fb3e24f, []int{3}
 }
 
 // Header is an enumeration of filtering header types.
-type EACLRecord_FilterInfo_Header int32
+type HeaderType int32
 
 const (
 	// Unspecified header, default value.
-	EACLRecord_FilterInfo_HEADER_UNSPECIFIED EACLRecord_FilterInfo_Header = 0
+	HeaderType_HEADER_UNSPECIFIED HeaderType = 0
 	// Filter request headers
-	EACLRecord_FilterInfo_REQUEST EACLRecord_FilterInfo_Header = 1
+	HeaderType_REQUEST HeaderType = 1
 	// Filter object headers
-	EACLRecord_FilterInfo_OBJECT EACLRecord_FilterInfo_Header = 2
+	HeaderType_OBJECT HeaderType = 2
 )
 
-var EACLRecord_FilterInfo_Header_name = map[int32]string{
+var HeaderType_name = map[int32]string{
 	0: "HEADER_UNSPECIFIED",
 	1: "REQUEST",
 	2: "OBJECT",
 }
 
-var EACLRecord_FilterInfo_Header_value = map[string]int32{
+var HeaderType_value = map[string]int32{
 	"HEADER_UNSPECIFIED": 0,
 	"REQUEST":            1,
 	"OBJECT":             2,
 }
 
-func (x EACLRecord_FilterInfo_Header) String() string {
-	return proto.EnumName(EACLRecord_FilterInfo_Header_name, int32(x))
+func (x HeaderType) String() string {
+	return proto.EnumName(HeaderType_name, int32(x))
 }
 
-func (EACLRecord_FilterInfo_Header) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_8233b6696fb3e24f, []int{0, 0, 0}
-}
-
-// MatchType is an enumeration of match types.
-type EACLRecord_FilterInfo_MatchType int32
-
-const (
-	// Unspecified match type, default value.
-	EACLRecord_FilterInfo_MATCH_TYPE_UNSPECIFIED EACLRecord_FilterInfo_MatchType = 0
-	// Return true if strings are equal
-	EACLRecord_FilterInfo_STRING_EQUAL EACLRecord_FilterInfo_MatchType = 1
-	// Return true if strings are different
-	EACLRecord_FilterInfo_STRING_NOT_EQUAL EACLRecord_FilterInfo_MatchType = 2
-)
-
-var EACLRecord_FilterInfo_MatchType_name = map[int32]string{
-	0: "MATCH_TYPE_UNSPECIFIED",
-	1: "STRING_EQUAL",
-	2: "STRING_NOT_EQUAL",
-}
-
-var EACLRecord_FilterInfo_MatchType_value = map[string]int32{
-	"MATCH_TYPE_UNSPECIFIED": 0,
-	"STRING_EQUAL":           1,
-	"STRING_NOT_EQUAL":       2,
-}
-
-func (x EACLRecord_FilterInfo_MatchType) String() string {
-	return proto.EnumName(EACLRecord_FilterInfo_MatchType_name, int32(x))
-}
-
-func (EACLRecord_FilterInfo_MatchType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_8233b6696fb3e24f, []int{0, 0, 1}
+func (HeaderType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_8233b6696fb3e24f, []int{4}
 }
 
 // EACLRecord groups information about extended ACL rule.
 type EACLRecord struct {
 	// Operation carries type of operation.
-	Operation EACLRecord_Operation `protobuf:"varint,1,opt,name=operation,json=Operation,proto3,enum=neo.fs.v2.acl.EACLRecord_Operation" json:"operation,omitempty"`
+	Operation Operation `protobuf:"varint,1,opt,name=operation,json=Operation,proto3,enum=neo.fs.v2.acl.Operation" json:"operation,omitempty"`
 	// Action carries ACL target action.
-	Action EACLRecord_Action `protobuf:"varint,2,opt,name=action,json=Action,proto3,enum=neo.fs.v2.acl.EACLRecord_Action" json:"action,omitempty"`
+	Action Action `protobuf:"varint,2,opt,name=action,json=Action,proto3,enum=neo.fs.v2.acl.Action" json:"action,omitempty"`
 	// filters carries set of filters.
 	Filters []*EACLRecord_FilterInfo `protobuf:"bytes,3,rep,name=filters,json=Filters,proto3" json:"filters,omitempty"`
 	// targets carries information about extended ACL target list.
@@ -256,18 +256,18 @@ func (m *EACLRecord) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_EACLRecord proto.InternalMessageInfo
 
-func (m *EACLRecord) GetOperation() EACLRecord_Operation {
+func (m *EACLRecord) GetOperation() Operation {
 	if m != nil {
 		return m.Operation
 	}
-	return EACLRecord_OPERATION_UNSPECIFIED
+	return Operation_OPERATION_UNSPECIFIED
 }
 
-func (m *EACLRecord) GetAction() EACLRecord_Action {
+func (m *EACLRecord) GetAction() Action {
 	if m != nil {
 		return m.Action
 	}
-	return EACLRecord_ACTION_UNSPECIFIED
+	return Action_ACTION_UNSPECIFIED
 }
 
 func (m *EACLRecord) GetFilters() []*EACLRecord_FilterInfo {
@@ -287,9 +287,9 @@ func (m *EACLRecord) GetTargets() []*EACLRecord_TargetInfo {
 // FilterInfo groups information about filter.
 type EACLRecord_FilterInfo struct {
 	// Header carries type of header.
-	Header EACLRecord_FilterInfo_Header `protobuf:"varint,1,opt,name=header,json=HeaderType,proto3,enum=neo.fs.v2.acl.EACLRecord_FilterInfo_Header" json:"header,omitempty"`
+	Header HeaderType `protobuf:"varint,1,opt,name=header,json=HeaderType,proto3,enum=neo.fs.v2.acl.HeaderType" json:"header,omitempty"`
 	// MatchType carries type of match.
-	MatchType EACLRecord_FilterInfo_MatchType `protobuf:"varint,2,opt,name=match_type,json=MatchType,proto3,enum=neo.fs.v2.acl.EACLRecord_FilterInfo_MatchType" json:"match_type,omitempty"`
+	MatchType MatchType `protobuf:"varint,2,opt,name=match_type,json=MatchType,proto3,enum=neo.fs.v2.acl.MatchType" json:"match_type,omitempty"`
 	// header_name carries name of filtering header.
 	HeaderName string `protobuf:"bytes,3,opt,name=header_name,json=Name,proto3" json:"header_name,omitempty"`
 	// header_val carries value of filtering header.
@@ -332,18 +332,18 @@ func (m *EACLRecord_FilterInfo) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_EACLRecord_FilterInfo proto.InternalMessageInfo
 
-func (m *EACLRecord_FilterInfo) GetHeader() EACLRecord_FilterInfo_Header {
+func (m *EACLRecord_FilterInfo) GetHeader() HeaderType {
 	if m != nil {
 		return m.Header
 	}
-	return EACLRecord_FilterInfo_HEADER_UNSPECIFIED
+	return HeaderType_HEADER_UNSPECIFIED
 }
 
-func (m *EACLRecord_FilterInfo) GetMatchType() EACLRecord_FilterInfo_MatchType {
+func (m *EACLRecord_FilterInfo) GetMatchType() MatchType {
 	if m != nil {
 		return m.MatchType
 	}
-	return EACLRecord_FilterInfo_MATCH_TYPE_UNSPECIFIED
+	return MatchType_MATCH_TYPE_UNSPECIFIED
 }
 
 func (m *EACLRecord_FilterInfo) GetHeaderName() string {
@@ -479,10 +479,10 @@ func (m *EACLTable) GetRecords() []*EACLRecord {
 
 func init() {
 	proto.RegisterEnum("neo.fs.v2.acl.Target", Target_name, Target_value)
-	proto.RegisterEnum("neo.fs.v2.acl.EACLRecord_Operation", EACLRecord_Operation_name, EACLRecord_Operation_value)
-	proto.RegisterEnum("neo.fs.v2.acl.EACLRecord_Action", EACLRecord_Action_name, EACLRecord_Action_value)
-	proto.RegisterEnum("neo.fs.v2.acl.EACLRecord_FilterInfo_Header", EACLRecord_FilterInfo_Header_name, EACLRecord_FilterInfo_Header_value)
-	proto.RegisterEnum("neo.fs.v2.acl.EACLRecord_FilterInfo_MatchType", EACLRecord_FilterInfo_MatchType_name, EACLRecord_FilterInfo_MatchType_value)
+	proto.RegisterEnum("neo.fs.v2.acl.MatchType", MatchType_name, MatchType_value)
+	proto.RegisterEnum("neo.fs.v2.acl.Operation", Operation_name, Operation_value)
+	proto.RegisterEnum("neo.fs.v2.acl.Action", Action_name, Action_value)
+	proto.RegisterEnum("neo.fs.v2.acl.HeaderType", HeaderType_name, HeaderType_value)
 	proto.RegisterType((*EACLRecord)(nil), "neo.fs.v2.acl.EACLRecord")
 	proto.RegisterType((*EACLRecord_FilterInfo)(nil), "neo.fs.v2.acl.EACLRecord.FilterInfo")
 	proto.RegisterType((*EACLRecord_TargetInfo)(nil), "neo.fs.v2.acl.EACLRecord.TargetInfo")
@@ -492,52 +492,51 @@ func init() {
 func init() { proto.RegisterFile("v2/acl/grpc/types.proto", fileDescriptor_8233b6696fb3e24f) }
 
 var fileDescriptor_8233b6696fb3e24f = []byte{
-	// 710 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xd1, 0x6e, 0xda, 0x3a,
-	0x18, 0x6e, 0x42, 0x1a, 0xe0, 0x87, 0x73, 0x64, 0x59, 0xa7, 0x1c, 0xca, 0x91, 0x10, 0xe2, 0xec,
-	0x02, 0xad, 0x6a, 0xd0, 0xa8, 0x26, 0x6d, 0x9a, 0x54, 0x29, 0x05, 0x17, 0xd8, 0x20, 0x50, 0xc7,
-	0x74, 0xea, 0x6e, 0x50, 0x1a, 0x0c, 0x45, 0x0b, 0x09, 0x4a, 0x52, 0x24, 0x76, 0xb5, 0xc7, 0xd8,
-	0x33, 0xec, 0x49, 0x76, 0xb9, 0x47, 0x98, 0x3a, 0x69, 0xcf, 0xb0, 0xcb, 0xc9, 0x09, 0xb4, 0x8c,
-	0xad, 0x5a, 0xaf, 0xfc, 0xc7, 0xfe, 0xbe, 0xdf, 0x9f, 0x3f, 0x7f, 0x31, 0xfc, 0xbb, 0xa8, 0x55,
-	0x2d, 0xdb, 0xa9, 0x4e, 0xfc, 0xb9, 0x5d, 0x0d, 0x97, 0x73, 0x1e, 0x68, 0x73, 0xdf, 0x0b, 0x3d,
-	0xfc, 0x97, 0xcb, 0x3d, 0x6d, 0x1c, 0x68, 0x8b, 0x9a, 0x66, 0xd9, 0x4e, 0x21, 0xbf, 0xa8, 0x55,
-	0x7d, 0x3e, 0x0e, 0x7e, 0x01, 0x96, 0xbf, 0xab, 0x00, 0x44, 0xaf, 0x77, 0x28, 0xb7, 0x3d, 0x7f,
-	0x84, 0x75, 0x48, 0x7b, 0x73, 0xee, 0x5b, 0xe1, 0xd4, 0x73, 0xf3, 0x52, 0x49, 0xaa, 0xfc, 0x5d,
-	0xfb, 0x5f, 0xfb, 0xa9, 0x97, 0x76, 0x87, 0xd6, 0x7a, 0x6b, 0x28, 0x4d, 0xdf, 0x96, 0xf8, 0x19,
-	0xa8, 0x96, 0x1d, 0xf1, 0xe5, 0x88, 0x5f, 0xba, 0x9f, 0xaf, 0x47, 0x38, 0xaa, 0xc6, 0x23, 0x3e,
-	0x86, 0xe4, 0x78, 0xea, 0x84, 0xdc, 0x0f, 0xf2, 0x89, 0x52, 0xa2, 0x92, 0xa9, 0x3d, 0xba, 0x9f,
-	0x7a, 0x1a, 0x01, 0xdb, 0xee, 0xd8, 0xa3, 0xc9, 0xb8, 0x0e, 0x04, 0x3f, 0xb4, 0xfc, 0x09, 0x0f,
-	0x83, 0xbc, 0xf2, 0x27, 0x3e, 0x8b, 0x80, 0x31, 0x3f, 0xae, 0x83, 0xc2, 0x37, 0x19, 0xe0, 0xae,
-	0x2f, 0x6e, 0x82, 0x7a, 0xc5, 0xad, 0x11, 0xf7, 0x57, 0x46, 0x1c, 0x3c, 0x44, 0x8d, 0xd6, 0x8a,
-	0x28, 0x14, 0xe2, 0x91, 0x2d, 0xe7, 0x1c, 0x77, 0x01, 0x66, 0x56, 0x68, 0x5f, 0x0d, 0x85, 0xf1,
-	0x2b, 0x57, 0xb4, 0x07, 0x35, 0xeb, 0x0a, 0x9a, 0xe8, 0x41, 0xd3, 0xb7, 0x25, 0xde, 0x87, 0x4c,
-	0xac, 0x6b, 0xe8, 0x5a, 0x33, 0x9e, 0x4f, 0x94, 0xa4, 0x4a, 0x9a, 0x2a, 0x86, 0x35, 0x13, 0x4b,
-	0xb0, 0x5a, 0x5a, 0x58, 0x4e, 0x5e, 0x89, 0x56, 0x76, 0xcf, 0x2d, 0xe7, 0x9a, 0x97, 0x9f, 0x83,
-	0x1a, 0x4b, 0xc2, 0x39, 0xc0, 0x2d, 0xa2, 0x37, 0x08, 0x1d, 0x0e, 0x0c, 0xb3, 0x4f, 0xea, 0xed,
-	0xd3, 0x36, 0x69, 0xa0, 0x1d, 0x9c, 0x81, 0x24, 0x25, 0x67, 0x03, 0x62, 0x32, 0x24, 0x61, 0x00,
-	0xb5, 0x77, 0xf2, 0x92, 0xd4, 0x19, 0x92, 0xcb, 0x3d, 0xd8, 0xd8, 0xbd, 0x00, 0xb9, 0xae, 0xce,
-	0xea, 0xad, 0x21, 0xbb, 0xe8, 0x93, 0xad, 0x0e, 0x08, 0xb2, 0x26, 0xa3, 0x6d, 0xa3, 0x39, 0x24,
-	0x67, 0x03, 0xbd, 0x83, 0x24, 0xfc, 0x0f, 0xa0, 0xd5, 0x8c, 0xd1, 0x63, 0xab, 0x59, 0xb9, 0x70,
-	0x06, 0x70, 0xe7, 0x3f, 0x3e, 0x00, 0x35, 0xbe, 0xb6, 0x95, 0xcf, 0x7b, 0x5b, 0xd6, 0xc4, 0x50,
-	0xaa, 0x50, 0xcf, 0xe1, 0x38, 0x07, 0xa9, 0xb7, 0x7c, 0x39, 0x74, 0xa6, 0x41, 0x98, 0x97, 0x4b,
-	0x89, 0x4a, 0x96, 0x2a, 0xaf, 0xf8, 0x32, 0x28, 0xbf, 0x83, 0x8d, 0x08, 0xee, 0xc3, 0x5e, 0xaf,
-	0x4f, 0xa8, 0xce, 0xda, 0x3d, 0x63, 0x4b, 0x62, 0x12, 0x12, 0x4d, 0x22, 0x0e, 0x98, 0x02, 0x45,
-	0xb8, 0x80, 0x64, 0x31, 0xd5, 0x1f, 0x30, 0x94, 0x10, 0x67, 0x6e, 0x90, 0x0e, 0x61, 0x04, 0x29,
-	0xa2, 0x36, 0x89, 0x4e, 0xeb, 0x2d, 0xb4, 0x8b, 0xb3, 0x90, 0x6a, 0x12, 0x46, 0x75, 0xa3, 0x49,
-	0x90, 0x2a, 0x0e, 0xb9, 0xfe, 0x6a, 0xe9, 0x66, 0x0b, 0x25, 0xcb, 0x4f, 0x61, 0x9d, 0xe0, 0x1c,
-	0x60, 0xbd, 0xfe, 0x9b, 0x5d, 0xd3, 0xb0, 0xab, 0x77, 0x3a, 0xbd, 0xd7, 0xf1, 0xbe, 0x0d, 0x62,
-	0x5c, 0x20, 0xb9, 0xfc, 0x5e, 0x82, 0xb4, 0xb8, 0x76, 0x66, 0x5d, 0x3a, 0x1c, 0x1f, 0x43, 0xd6,
-	0xf6, 0xdc, 0xd0, 0x9a, 0xba, 0xdc, 0x1f, 0x4e, 0x47, 0x91, 0x17, 0x99, 0xda, 0x7f, 0x1b, 0x5e,
-	0x88, 0x1f, 0x58, 0xab, 0xaf, 0x31, 0xed, 0x06, 0xcd, 0x6c, 0x7c, 0xe0, 0x23, 0x48, 0xfa, 0x51,
-	0x7e, 0x82, 0xc8, 0x97, 0x4c, 0x6d, 0xff, 0xde, 0x84, 0xd1, 0x64, 0x3c, 0x06, 0x8f, 0x4f, 0x40,
-	0x8d, 0xdd, 0x15, 0xca, 0x99, 0x4e, 0x9b, 0x84, 0x6d, 0x29, 0x4f, 0x81, 0x32, 0x30, 0x09, 0x8d,
-	0x13, 0x61, 0x5e, 0x98, 0x8c, 0x74, 0x91, 0x1c, 0xa5, 0x83, 0xb5, 0x08, 0x35, 0x51, 0xe2, 0xe4,
-	0xfc, 0xd3, 0x4d, 0x51, 0xfa, 0x7c, 0x53, 0x94, 0xbe, 0xdc, 0x14, 0xa5, 0x0f, 0x5f, 0x8b, 0x3b,
-	0x6f, 0x9e, 0x4c, 0xa6, 0xe1, 0xd5, 0xf5, 0xa5, 0x66, 0x7b, 0xb3, 0xaa, 0x1b, 0xcc, 0x6d, 0xfb,
-	0x70, 0xc4, 0x17, 0x55, 0x97, 0x7b, 0xe3, 0xe0, 0xd0, 0x9a, 0x4f, 0x0f, 0x27, 0x5e, 0x75, 0xe3,
-	0xdd, 0x7a, 0x61, 0xd9, 0xce, 0x47, 0x19, 0x19, 0xdc, 0x3b, 0x35, 0x35, 0xbd, 0xdf, 0x16, 0x7a,
-	0x75, 0xdb, 0xb9, 0x54, 0xa3, 0x07, 0xea, 0xe8, 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf6, 0x1c,
-	0x01, 0xad, 0xe4, 0x04, 0x00, 0x00,
+	// 703 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xd1, 0x6e, 0xda, 0x48,
+	0x14, 0x8d, 0x6d, 0x62, 0xc2, 0x85, 0x5d, 0x8d, 0x46, 0x1b, 0xd6, 0x61, 0x25, 0x84, 0xa2, 0x7d,
+	0x40, 0xac, 0x30, 0x5a, 0xa2, 0xec, 0x3e, 0x54, 0x8d, 0xe4, 0xc0, 0x04, 0x68, 0x89, 0x4d, 0xc6,
+	0x43, 0xaa, 0xf4, 0x05, 0x39, 0x66, 0x20, 0xa8, 0xc6, 0x46, 0xb6, 0x83, 0x44, 0x9f, 0xfa, 0x19,
+	0xfd, 0x86, 0x3e, 0xf6, 0x2b, 0xfa, 0xd8, 0x4f, 0xa8, 0xd2, 0xcf, 0xe8, 0x4b, 0x65, 0x1b, 0x02,
+	0x75, 0x2a, 0xf5, 0xc9, 0xd7, 0x73, 0xcf, 0x39, 0xf7, 0xcc, 0xf1, 0x78, 0xe0, 0xcf, 0x65, 0xb3,
+	0x61, 0xd9, 0x4e, 0x63, 0xea, 0x2f, 0xec, 0x46, 0xb8, 0x5a, 0xf0, 0x40, 0x5d, 0xf8, 0x5e, 0xe8,
+	0xe1, 0xdf, 0x5c, 0xee, 0xa9, 0x93, 0x40, 0x5d, 0x36, 0x55, 0xcb, 0x76, 0x4a, 0xca, 0xb2, 0xd9,
+	0xf0, 0xf9, 0x24, 0x78, 0x02, 0x3c, 0xfe, 0x26, 0x01, 0x10, 0xad, 0xd5, 0xa7, 0xdc, 0xf6, 0xfc,
+	0x31, 0xfe, 0x0f, 0x72, 0xde, 0x82, 0xfb, 0x56, 0x38, 0xf3, 0x5c, 0x45, 0xa8, 0x08, 0xd5, 0xdf,
+	0x9b, 0x8a, 0xfa, 0x83, 0x96, 0x6a, 0x6c, 0xfa, 0x34, 0xf7, 0x58, 0xe2, 0x3a, 0xc8, 0x96, 0x1d,
+	0x93, 0xc4, 0x98, 0x74, 0x98, 0x22, 0x69, 0x71, 0x93, 0xca, 0xc9, 0x13, 0x9f, 0x41, 0x76, 0x32,
+	0x73, 0x42, 0xee, 0x07, 0x8a, 0x54, 0x91, 0xaa, 0xf9, 0xe6, 0xdf, 0x29, 0xfc, 0xd6, 0x92, 0x7a,
+	0x11, 0x03, 0x7b, 0xee, 0xc4, 0xa3, 0xd9, 0xa4, 0x0e, 0x22, 0x7e, 0x68, 0xf9, 0x53, 0x1e, 0x06,
+	0x4a, 0xe6, 0x57, 0x7c, 0x16, 0x03, 0x13, 0x7e, 0x52, 0x07, 0xa5, 0x8f, 0x02, 0xc0, 0x56, 0x17,
+	0x9f, 0x82, 0x7c, 0xc7, 0xad, 0x31, 0xf7, 0xd7, 0x5b, 0x3e, 0x4a, 0xa9, 0x75, 0xe3, 0x26, 0x5b,
+	0x2d, 0x38, 0x85, 0x6d, 0x8d, 0xff, 0x07, 0x98, 0x5b, 0xa1, 0x7d, 0x37, 0x8a, 0x02, 0x5d, 0x6f,
+	0x3c, 0x9d, 0xd6, 0x65, 0x04, 0x88, 0x99, 0xb9, 0xc7, 0x12, 0x1f, 0x41, 0x3e, 0x99, 0x37, 0x72,
+	0xad, 0x39, 0x57, 0xa4, 0x8a, 0x50, 0xcd, 0xd1, 0x8c, 0x6e, 0xcd, 0xa3, 0x16, 0xac, 0x5b, 0x4b,
+	0xcb, 0x51, 0x32, 0x71, 0x67, 0xff, 0xda, 0x72, 0xee, 0x79, 0xe9, 0x0a, 0x60, 0xbb, 0x17, 0xfc,
+	0x0f, 0xc8, 0x49, 0x04, 0x6b, 0xcf, 0xe9, 0xc4, 0x13, 0x28, 0xcd, 0x50, 0xcf, 0xe1, 0xb8, 0x08,
+	0x07, 0x6f, 0xf8, 0x6a, 0xe4, 0xcc, 0x82, 0x50, 0x11, 0x2b, 0x52, 0xb5, 0x40, 0x33, 0x2f, 0xf9,
+	0x2a, 0x38, 0x7e, 0x27, 0x40, 0x2e, 0x8a, 0x8a, 0x59, 0xb7, 0x0e, 0xc7, 0x67, 0x50, 0xb0, 0x3d,
+	0x37, 0xb4, 0x66, 0x2e, 0xf7, 0x47, 0xb3, 0x71, 0x2c, 0x9c, 0x6f, 0xfe, 0xb5, 0x23, 0x1c, 0x9d,
+	0x21, 0xb5, 0xb5, 0xc1, 0xf4, 0xda, 0x34, 0xbf, 0xf3, 0x82, 0x4f, 0x20, 0xeb, 0xc7, 0x99, 0x07,
+	0xf1, 0x90, 0xfc, 0x93, 0x1c, 0xb7, 0x5f, 0x85, 0x66, 0x93, 0x67, 0x50, 0x3b, 0x07, 0x39, 0xb1,
+	0x8a, 0x8b, 0x80, 0x99, 0x46, 0x3b, 0x84, 0x8d, 0x86, 0xba, 0x39, 0x20, 0xad, 0xde, 0x45, 0x8f,
+	0xb4, 0xd1, 0x1e, 0x3e, 0x80, 0xcc, 0xd0, 0x24, 0x14, 0x09, 0x18, 0x40, 0x36, 0x6f, 0x4c, 0x46,
+	0x2e, 0x91, 0x18, 0xd5, 0x06, 0xeb, 0x12, 0x6a, 0x22, 0xa9, 0x66, 0xc0, 0x4e, 0xb8, 0x25, 0x28,
+	0x5e, 0x6a, 0xac, 0xd5, 0x1d, 0xb1, 0x9b, 0x01, 0x49, 0x49, 0x21, 0x28, 0x98, 0x8c, 0xf6, 0xf4,
+	0xce, 0x88, 0x5c, 0x0d, 0xb5, 0x3e, 0x12, 0xf0, 0x1f, 0x80, 0xd6, 0x2b, 0xba, 0xc1, 0xd6, 0xab,
+	0x62, 0xed, 0x2d, 0xec, 0x9c, 0xed, 0x23, 0x38, 0x34, 0x06, 0x84, 0x6a, 0xac, 0x67, 0xe8, 0x29,
+	0xbd, 0x2c, 0x48, 0x1d, 0xc2, 0x90, 0x10, 0x79, 0xec, 0x12, 0xad, 0x8d, 0xc4, 0x68, 0x69, 0x30,
+	0x64, 0x48, 0x8a, 0x0c, 0xb6, 0x49, 0x9f, 0x30, 0x82, 0x32, 0xb1, 0x71, 0xa2, 0xd1, 0x56, 0x17,
+	0xed, 0xe3, 0x02, 0x1c, 0x74, 0x08, 0xa3, 0x9a, 0xde, 0x21, 0x48, 0x8e, 0x1c, 0x6d, 0xde, 0xba,
+	0x9a, 0xd9, 0x45, 0xd9, 0xda, 0x29, 0x6c, 0xfe, 0x92, 0x22, 0x60, 0xad, 0xf5, 0x93, 0xa9, 0x39,
+	0xd8, 0xd7, 0xfa, 0x7d, 0xe3, 0x55, 0x32, 0xb7, 0x4d, 0xf4, 0x1b, 0x24, 0xd6, 0x9e, 0xc3, 0xee,
+	0xd1, 0x2c, 0x02, 0x8e, 0xfc, 0x10, 0x9a, 0xa2, 0xe6, 0x21, 0x4b, 0xc9, 0xd5, 0x90, 0x98, 0x2c,
+	0x89, 0xd3, 0x38, 0x7f, 0x41, 0x5a, 0x0c, 0x89, 0xe7, 0xd7, 0x9f, 0x1e, 0xca, 0xc2, 0xe7, 0x87,
+	0xb2, 0xf0, 0xe5, 0xa1, 0x2c, 0xbc, 0xff, 0x5a, 0xde, 0x7b, 0xfd, 0xef, 0x74, 0x16, 0xde, 0xdd,
+	0xdf, 0xaa, 0xb6, 0x37, 0x6f, 0xb8, 0xc1, 0xc2, 0xb6, 0xeb, 0x63, 0xbe, 0x6c, 0xb8, 0xdc, 0x9b,
+	0x04, 0x75, 0x6b, 0x31, 0xab, 0x4f, 0xbd, 0xc6, 0xce, 0xed, 0xf3, 0xcc, 0xb2, 0x9d, 0x0f, 0x22,
+	0xd2, 0xb9, 0x77, 0x61, 0xaa, 0xda, 0xa0, 0x17, 0x7d, 0x72, 0xcd, 0x76, 0x6e, 0xe5, 0xf8, 0x9a,
+	0x39, 0xf9, 0x1e, 0x00, 0x00, 0xff, 0xff, 0xef, 0xd5, 0x9b, 0x33, 0xaa, 0x04, 0x00, 0x00,
 }
 
 func (m *EACLRecord) Marshal() (dAtA []byte, err error) {
@@ -909,7 +908,7 @@ func (m *EACLRecord) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				m.Operation |= EACLRecord_Operation(b&0x7F) << shift
+				m.Operation |= Operation(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
@@ -928,7 +927,7 @@ func (m *EACLRecord) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				m.Action |= EACLRecord_Action(b&0x7F) << shift
+				m.Action |= Action(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
@@ -1069,7 +1068,7 @@ func (m *EACLRecord_FilterInfo) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				m.Header |= EACLRecord_FilterInfo_Header(b&0x7F) << shift
+				m.Header |= HeaderType(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
@@ -1088,7 +1087,7 @@ func (m *EACLRecord_FilterInfo) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				m.MatchType |= EACLRecord_FilterInfo_MatchType(b&0x7F) << shift
+				m.MatchType |= MatchType(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
diff --git a/v2/container/grpc/types.pb.go b/v2/container/grpc/types.pb.go
index 9cd174d..f2b1733 100644
--- a/v2/container/grpc/types.pb.go
+++ b/v2/container/grpc/types.pb.go
@@ -6,8 +6,9 @@ package container
 import (
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	grpc1 "github.com/nspcc-dev/neofs-api-go/v2/netmap/grpc"
-	grpc "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc"
+	grpc2 "github.com/nspcc-dev/neofs-api-go/v2/netmap/grpc"
+	grpc1 "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc"
+	grpc "github.com/nspcc-dev/neofs-api-go/v2/service/grpc"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -29,17 +30,20 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 // and access control information. ID of the container is a 32 byte long
 // SHA256 hash of stable-marshalled container message.
 type Container struct {
+	// Container format version.
+	// Effectively the version of API library used to create container
+	Version *grpc.Version `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"`
 	// OwnerID carries identifier of the container owner.
-	OwnerId *grpc.OwnerID `protobuf:"bytes,1,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"`
+	OwnerId *grpc1.OwnerID `protobuf:"bytes,2,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"`
 	// Nonce is a 16 byte UUID, used to avoid collisions of container id.
-	Nonce []byte `protobuf:"bytes,2,opt,name=nonce,proto3" json:"nonce,omitempty"`
+	Nonce []byte `protobuf:"bytes,3,opt,name=nonce,proto3" json:"nonce,omitempty"`
 	// BasicACL contains access control rules for owner, system, others groups and
 	// permission bits for bearer token and Extended ACL.
-	BasicAcl uint32 `protobuf:"varint,3,opt,name=basic_acl,json=basicAcl,proto3" json:"basic_acl,omitempty"`
+	BasicAcl uint32 `protobuf:"varint,4,opt,name=basic_acl,json=basicAcl,proto3" json:"basic_acl,omitempty"`
 	// Attributes define any immutable characteristics of container.
-	Attributes []*Container_Attribute `protobuf:"bytes,4,rep,name=attributes,proto3" json:"attributes,omitempty"`
+	Attributes []*Container_Attribute `protobuf:"bytes,5,rep,name=attributes,proto3" json:"attributes,omitempty"`
 	// Placement policy for the object inside the container.
-	PlacementPolicy      *grpc1.PlacementPolicy `protobuf:"bytes,5,opt,name=placement_policy,json=placementPolicy,proto3" json:"placement_policy,omitempty"`
+	PlacementPolicy      *grpc2.PlacementPolicy `protobuf:"bytes,6,opt,name=placement_policy,json=placementPolicy,proto3" json:"placement_policy,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
 	XXX_unrecognized     []byte                 `json:"-"`
 	XXX_sizecache        int32                  `json:"-"`
@@ -78,7 +82,14 @@ func (m *Container) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_Container proto.InternalMessageInfo
 
-func (m *Container) GetOwnerId() *grpc.OwnerID {
+func (m *Container) GetVersion() *grpc.Version {
+	if m != nil {
+		return m.Version
+	}
+	return nil
+}
+
+func (m *Container) GetOwnerId() *grpc1.OwnerID {
 	if m != nil {
 		return m.OwnerId
 	}
@@ -106,7 +117,7 @@ func (m *Container) GetAttributes() []*Container_Attribute {
 	return nil
 }
 
-func (m *Container) GetPlacementPolicy() *grpc1.PlacementPolicy {
+func (m *Container) GetPlacementPolicy() *grpc2.PlacementPolicy {
 	if m != nil {
 		return m.PlacementPolicy
 	}
@@ -179,30 +190,32 @@ func init() {
 func init() { proto.RegisterFile("v2/container/grpc/types.proto", fileDescriptor_3bfd95a81c72c35c) }
 
 var fileDescriptor_3bfd95a81c72c35c = []byte{
-	// 363 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x51, 0xc1, 0x4e, 0xea, 0x40,
-	0x14, 0x7d, 0x85, 0xc7, 0x7b, 0x74, 0xd0, 0x48, 0xaa, 0xd1, 0xa6, 0xc6, 0xa6, 0xba, 0xea, 0x86,
-	0x99, 0xa4, 0x2c, 0x8d, 0x0b, 0xd4, 0x18, 0x49, 0x8c, 0x92, 0xba, 0x73, 0x43, 0xa6, 0xc3, 0x05,
-	0x1a, 0xcb, 0xcc, 0xa4, 0x33, 0xd4, 0xf0, 0x27, 0x7e, 0x83, 0x3f, 0xe1, 0xd6, 0xa5, 0x9f, 0x60,
-	0xf0, 0x47, 0x4c, 0xdb, 0x50, 0x31, 0xb8, 0x9b, 0x3b, 0xf7, 0xdc, 0x73, 0xcf, 0x39, 0x17, 0x1d,
-	0x65, 0x01, 0x61, 0x82, 0x6b, 0x1a, 0x73, 0x48, 0xc9, 0x24, 0x95, 0x8c, 0xe8, 0x85, 0x04, 0x85,
-	0x65, 0x2a, 0xb4, 0xb0, 0x76, 0x39, 0x08, 0x3c, 0x56, 0x38, 0x0b, 0x70, 0x85, 0x72, 0x9c, 0x2c,
-	0x20, 0x1c, 0xf4, 0x8c, 0xca, 0x8d, 0x01, 0xc7, 0xce, 0x02, 0x92, 0xc2, 0x58, 0x6d, 0x74, 0x4e,
-	0x5e, 0x6b, 0xc8, 0xbc, 0x58, 0x71, 0x58, 0x01, 0x6a, 0x8a, 0x27, 0x0e, 0xe9, 0x30, 0x1e, 0xd9,
-	0x86, 0x67, 0xf8, 0xad, 0xe0, 0x00, 0x7f, 0xef, 0xca, 0x19, 0xf0, 0x5d, 0xde, 0xef, 0x5f, 0x86,
-	0xff, 0x0b, 0x60, 0x7f, 0x64, 0xed, 0xa1, 0x06, 0x17, 0x9c, 0x81, 0x5d, 0xf3, 0x0c, 0x7f, 0x2b,
-	0x2c, 0x0b, 0xeb, 0x10, 0x99, 0x11, 0x55, 0x31, 0x1b, 0x52, 0x96, 0xd8, 0x75, 0xcf, 0xf0, 0xb7,
-	0xc3, 0x66, 0xf1, 0xd1, 0x63, 0x89, 0x75, 0x8d, 0x10, 0xd5, 0x3a, 0x8d, 0xa3, 0xb9, 0x06, 0x65,
-	0xff, 0xf5, 0xea, 0x7e, 0x2b, 0xf0, 0xf1, 0x2f, 0xa6, 0x70, 0x25, 0x0d, 0xf7, 0x56, 0x03, 0xe1,
-	0xda, 0xac, 0x75, 0x83, 0xda, 0x32, 0xa1, 0x0c, 0x66, 0xc0, 0xf5, 0x50, 0x8a, 0x24, 0x66, 0x0b,
-	0xbb, 0x51, 0x08, 0x3f, 0x5e, 0xe3, 0x2b, 0x63, 0xc1, 0x83, 0x15, 0x72, 0x50, 0x00, 0xc3, 0x1d,
-	0xf9, 0xf3, 0xc3, 0xe9, 0x22, 0xb3, 0x5a, 0x63, 0xb5, 0x51, 0xfd, 0x11, 0x16, 0x45, 0x0c, 0x66,
-	0x98, 0x3f, 0x73, 0xa7, 0x19, 0x4d, 0xe6, 0xa5, 0x53, 0x33, 0x2c, 0x8b, 0xf3, 0xe9, 0xdb, 0xd2,
-	0x35, 0xde, 0x97, 0xae, 0xf1, 0xb1, 0x74, 0x8d, 0xe7, 0x4f, 0xf7, 0xcf, 0xc3, 0xd9, 0x24, 0xd6,
-	0xd3, 0x79, 0x84, 0x99, 0x98, 0x11, 0xae, 0x24, 0x63, 0x9d, 0x11, 0x64, 0x84, 0x83, 0x18, 0xab,
-	0x0e, 0x95, 0x71, 0x67, 0x22, 0xc8, 0xc6, 0x7d, 0x4f, 0xab, 0xf2, 0xa5, 0xb6, 0x7f, 0x0b, 0xe2,
-	0xea, 0x1e, 0xf7, 0x06, 0xfd, 0x5c, 0x7c, 0x15, 0x41, 0xf4, 0xaf, 0x38, 0x59, 0xf7, 0x2b, 0x00,
-	0x00, 0xff, 0xff, 0x83, 0x61, 0x0e, 0xc4, 0x1e, 0x02, 0x00, 0x00,
+	// 400 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x52, 0xcd, 0xaa, 0x13, 0x31,
+	0x14, 0x76, 0x5a, 0xef, 0xcf, 0xe4, 0x2a, 0x5e, 0xa2, 0xe8, 0x30, 0x62, 0xa9, 0xae, 0x66, 0xd3,
+	0x04, 0xe6, 0xba, 0x13, 0x17, 0x55, 0x11, 0x0b, 0xa2, 0x25, 0x82, 0x0b, 0x37, 0x25, 0x4d, 0x4f,
+	0xdb, 0xe0, 0x34, 0x09, 0x49, 0x1a, 0xe9, 0x9b, 0xf8, 0x0c, 0x3e, 0x89, 0x4b, 0x1f, 0x41, 0xea,
+	0x33, 0xb8, 0x97, 0xc9, 0x38, 0x63, 0xa5, 0x77, 0x97, 0x73, 0xbe, 0xef, 0x3b, 0xf9, 0xce, 0x97,
+	0xa0, 0x47, 0xa1, 0xa4, 0x42, 0x2b, 0xcf, 0xa5, 0x02, 0x4b, 0x57, 0xd6, 0x08, 0xea, 0x77, 0x06,
+	0x1c, 0x31, 0x56, 0x7b, 0x8d, 0xef, 0x2a, 0xd0, 0x64, 0xe9, 0x48, 0x28, 0x49, 0xc7, 0xca, 0xf3,
+	0x50, 0x52, 0x05, 0x7e, 0xc3, 0xcd, 0x91, 0x20, 0xcf, 0x42, 0x49, 0x2d, 0x2c, 0xdd, 0x31, 0x52,
+	0xab, 0x1c, 0xd8, 0x20, 0x05, 0x34, 0xe0, 0x06, 0x3c, 0x6f, 0xb0, 0x27, 0xbf, 0x7b, 0x28, 0x7d,
+	0xd9, 0xce, 0xc7, 0x4f, 0xd1, 0x59, 0x00, 0xeb, 0xa4, 0x56, 0x59, 0x32, 0x4c, 0x8a, 0x8b, 0x32,
+	0x27, 0xff, 0x6c, 0xfc, 0x1d, 0x41, 0x3e, 0x36, 0x0c, 0xd6, 0x52, 0x71, 0x89, 0xce, 0xf5, 0x17,
+	0x05, 0x76, 0x26, 0x17, 0x59, 0x2f, 0xca, 0x1e, 0x1c, 0xc8, 0x6a, 0x4f, 0xe4, 0x7d, 0x8d, 0x4f,
+	0x5e, 0xb1, 0xb3, 0x48, 0x9c, 0x2c, 0xf0, 0x3d, 0x74, 0xa2, 0xb4, 0x12, 0x90, 0xf5, 0x87, 0x49,
+	0x71, 0x8b, 0x35, 0x05, 0x7e, 0x88, 0xd2, 0x39, 0x77, 0x52, 0xcc, 0xb8, 0xa8, 0xb2, 0x9b, 0xc3,
+	0xa4, 0xb8, 0xcd, 0xce, 0x63, 0x63, 0x2c, 0x2a, 0xfc, 0x06, 0x21, 0xee, 0xbd, 0x95, 0xf3, 0xad,
+	0x07, 0x97, 0x9d, 0x0c, 0xfb, 0xc5, 0x45, 0x59, 0x90, 0x6b, 0x62, 0x22, 0xdd, 0x42, 0x64, 0xdc,
+	0x0a, 0xd8, 0x81, 0x16, 0xbf, 0x45, 0x97, 0xa6, 0xe2, 0x02, 0x36, 0xa0, 0xfc, 0xcc, 0xe8, 0x4a,
+	0x8a, 0x5d, 0x76, 0x1a, 0x8d, 0x3f, 0x3e, 0x98, 0xd7, 0x04, 0x4d, 0xa6, 0x2d, 0x73, 0x1a, 0x89,
+	0xec, 0x8e, 0xf9, 0xbf, 0x91, 0x5f, 0xa1, 0xb4, 0xbb, 0x06, 0x5f, 0xa2, 0xfe, 0x67, 0xd8, 0xc5,
+	0xf4, 0x52, 0x56, 0x1f, 0xeb, 0x4d, 0x03, 0xaf, 0xb6, 0x10, 0xa3, 0x49, 0x59, 0x53, 0xbc, 0x58,
+	0x7f, 0xdf, 0x0f, 0x92, 0x1f, 0xfb, 0x41, 0xf2, 0x73, 0x3f, 0x48, 0xbe, 0xfe, 0x1a, 0xdc, 0xf8,
+	0xf4, 0x7c, 0x25, 0xfd, 0x7a, 0x3b, 0x27, 0x42, 0x6f, 0xa8, 0x72, 0x46, 0x88, 0xd1, 0x02, 0x02,
+	0x55, 0xa0, 0x97, 0x6e, 0xc4, 0x8d, 0x1c, 0xad, 0x34, 0x3d, 0xfa, 0x31, 0xcf, 0xba, 0xf2, 0x5b,
+	0xef, 0xfe, 0x3b, 0xd0, 0xaf, 0x3f, 0x90, 0xf1, 0x74, 0x52, 0x9b, 0xef, 0x22, 0x98, 0x9f, 0xc6,
+	0x87, 0xbe, 0xfa, 0x13, 0x00, 0x00, 0xff, 0xff, 0xbd, 0xc4, 0xfa, 0xf8, 0x70, 0x02, 0x00, 0x00,
 }
 
 func (m *Container) Marshal() (dAtA []byte, err error) {
@@ -239,7 +252,7 @@ func (m *Container) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintTypes(dAtA, i, uint64(size))
 		}
 		i--
-		dAtA[i] = 0x2a
+		dAtA[i] = 0x32
 	}
 	if len(m.Attributes) > 0 {
 		for iNdEx := len(m.Attributes) - 1; iNdEx >= 0; iNdEx-- {
@@ -252,20 +265,20 @@ func (m *Container) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 				i = encodeVarintTypes(dAtA, i, uint64(size))
 			}
 			i--
-			dAtA[i] = 0x22
+			dAtA[i] = 0x2a
 		}
 	}
 	if m.BasicAcl != 0 {
 		i = encodeVarintTypes(dAtA, i, uint64(m.BasicAcl))
 		i--
-		dAtA[i] = 0x18
+		dAtA[i] = 0x20
 	}
 	if len(m.Nonce) > 0 {
 		i -= len(m.Nonce)
 		copy(dAtA[i:], m.Nonce)
 		i = encodeVarintTypes(dAtA, i, uint64(len(m.Nonce)))
 		i--
-		dAtA[i] = 0x12
+		dAtA[i] = 0x1a
 	}
 	if m.OwnerId != nil {
 		{
@@ -277,6 +290,18 @@ func (m *Container) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintTypes(dAtA, i, uint64(size))
 		}
 		i--
+		dAtA[i] = 0x12
+	}
+	if m.Version != nil {
+		{
+			size, err := m.Version.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintTypes(dAtA, i, uint64(size))
+		}
+		i--
 		dAtA[i] = 0xa
 	}
 	return len(dAtA) - i, nil
@@ -340,6 +365,10 @@ func (m *Container) Size() (n int) {
 	}
 	var l int
 	_ = l
+	if m.Version != nil {
+		l = m.Version.Size()
+		n += 1 + l + sovTypes(uint64(l))
+	}
 	if m.OwnerId != nil {
 		l = m.OwnerId.Size()
 		n += 1 + l + sovTypes(uint64(l))
@@ -423,6 +452,42 @@ func (m *Container) Unmarshal(dAtA []byte) error {
 		}
 		switch fieldNum {
 		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTypes
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTypes
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Version == nil {
+				m.Version = &grpc.Version{}
+			}
+			if err := m.Version.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 2:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field OwnerId", wireType)
 			}
@@ -452,13 +517,13 @@ func (m *Container) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.OwnerId == nil {
-				m.OwnerId = &grpc.OwnerID{}
+				m.OwnerId = &grpc1.OwnerID{}
 			}
 			if err := m.OwnerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
-		case 2:
+		case 3:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Nonce", wireType)
 			}
@@ -492,7 +557,7 @@ func (m *Container) Unmarshal(dAtA []byte) error {
 				m.Nonce = []byte{}
 			}
 			iNdEx = postIndex
-		case 3:
+		case 4:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field BasicAcl", wireType)
 			}
@@ -511,7 +576,7 @@ func (m *Container) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
-		case 4:
+		case 5:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Attributes", wireType)
 			}
@@ -545,7 +610,7 @@ func (m *Container) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 5:
+		case 6:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field PlacementPolicy", wireType)
 			}
@@ -575,7 +640,7 @@ func (m *Container) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.PlacementPolicy == nil {
-				m.PlacementPolicy = &grpc1.PlacementPolicy{}
+				m.PlacementPolicy = &grpc2.PlacementPolicy{}
 			}
 			if err := m.PlacementPolicy.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
diff --git a/v2/object/grpc/service.pb.go b/v2/object/grpc/service.pb.go
index a6f18df..5a398c6 100644
--- a/v2/object/grpc/service.pb.go
+++ b/v2/object/grpc/service.pb.go
@@ -28,34 +28,6 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
-// Type of match expression
-type SearchRequest_Body_Filter_MatchType int32
-
-const (
-	// Unknown. Not used
-	SearchRequest_Body_Filter_MATCH_TYPE_UNSPECIFIED SearchRequest_Body_Filter_MatchType = 0
-	// Full string match
-	SearchRequest_Body_Filter_STRING_EQUAL SearchRequest_Body_Filter_MatchType = 1
-)
-
-var SearchRequest_Body_Filter_MatchType_name = map[int32]string{
-	0: "MATCH_TYPE_UNSPECIFIED",
-	1: "STRING_EQUAL",
-}
-
-var SearchRequest_Body_Filter_MatchType_value = map[string]int32{
-	"MATCH_TYPE_UNSPECIFIED": 0,
-	"STRING_EQUAL":           1,
-}
-
-func (x SearchRequest_Body_Filter_MatchType) String() string {
-	return proto.EnumName(SearchRequest_Body_Filter_MatchType_name, int32(x))
-}
-
-func (SearchRequest_Body_Filter_MatchType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_1d7d92b1e85e5b48, []int{8, 0, 0, 0}
-}
-
 // Get object request
 type GetRequest struct {
 	// Body of get object request message.
@@ -1223,7 +1195,7 @@ type HeadResponse_Body struct {
 	//
 	// Types that are valid to be assigned to Head:
 	//	*HeadResponse_Body_Header
-	//	*HeadResponse_Body_ShortHeader_
+	//	*HeadResponse_Body_ShortHeader
 	Head                 isHeadResponse_Body_Head `protobuf_oneof:"head"`
 	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
 	XXX_unrecognized     []byte                   `json:"-"`
@@ -1272,12 +1244,12 @@ type isHeadResponse_Body_Head interface {
 type HeadResponse_Body_Header struct {
 	Header *Header `protobuf:"bytes,1,opt,name=header,proto3,oneof" json:"header,omitempty"`
 }
-type HeadResponse_Body_ShortHeader_ struct {
-	ShortHeader *HeadResponse_Body_ShortHeader `protobuf:"bytes,2,opt,name=short_header,json=shortHeader,proto3,oneof" json:"short_header,omitempty"`
+type HeadResponse_Body_ShortHeader struct {
+	ShortHeader *ShortHeader `protobuf:"bytes,2,opt,name=short_header,json=shortHeader,proto3,oneof" json:"short_header,omitempty"`
 }
 
-func (*HeadResponse_Body_Header) isHeadResponse_Body_Head()       {}
-func (*HeadResponse_Body_ShortHeader_) isHeadResponse_Body_Head() {}
+func (*HeadResponse_Body_Header) isHeadResponse_Body_Head()      {}
+func (*HeadResponse_Body_ShortHeader) isHeadResponse_Body_Head() {}
 
 func (m *HeadResponse_Body) GetHead() isHeadResponse_Body_Head {
 	if m != nil {
@@ -1293,8 +1265,8 @@ func (m *HeadResponse_Body) GetHeader() *Header {
 	return nil
 }
 
-func (m *HeadResponse_Body) GetShortHeader() *HeadResponse_Body_ShortHeader {
-	if x, ok := m.GetHead().(*HeadResponse_Body_ShortHeader_); ok {
+func (m *HeadResponse_Body) GetShortHeader() *ShortHeader {
+	if x, ok := m.GetHead().(*HeadResponse_Body_ShortHeader); ok {
 		return x.ShortHeader
 	}
 	return nil
@@ -1304,96 +1276,10 @@ func (m *HeadResponse_Body) GetShortHeader() *HeadResponse_Body_ShortHeader {
 func (*HeadResponse_Body) XXX_OneofWrappers() []interface{} {
 	return []interface{}{
 		(*HeadResponse_Body_Header)(nil),
-		(*HeadResponse_Body_ShortHeader_)(nil),
+		(*HeadResponse_Body_ShortHeader)(nil),
 	}
 }
 
-// Short header fields
-type HeadResponse_Body_ShortHeader struct {
-	// Object format version.
-	Version *grpc.Version `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"`
-	// Epoch when the object was created
-	CreationEpoch uint64 `protobuf:"varint,2,opt,name=creation_epoch,json=creationEpoch,proto3" json:"creation_epoch,omitempty"`
-	// Object's owner
-	OwnerId *grpc1.OwnerID `protobuf:"bytes,3,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"`
-	// Type of the object payload content
-	ObjectType ObjectType `protobuf:"varint,4,opt,name=object_type,json=objectType,proto3,enum=neo.fs.v2.object.ObjectType" json:"object_type,omitempty"`
-	// Size of payload in bytes.
-	// 0xFFFFFFFFFFFFFFFF means `payload_length` is unknown
-	PayloadLength        uint64   `protobuf:"varint,5,opt,name=payload_length,json=payloadLength,proto3" json:"payload_length,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *HeadResponse_Body_ShortHeader) Reset()         { *m = HeadResponse_Body_ShortHeader{} }
-func (m *HeadResponse_Body_ShortHeader) String() string { return proto.CompactTextString(m) }
-func (*HeadResponse_Body_ShortHeader) ProtoMessage()    {}
-func (*HeadResponse_Body_ShortHeader) Descriptor() ([]byte, []int) {
-	return fileDescriptor_1d7d92b1e85e5b48, []int{7, 0, 0}
-}
-func (m *HeadResponse_Body_ShortHeader) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *HeadResponse_Body_ShortHeader) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_HeadResponse_Body_ShortHeader.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *HeadResponse_Body_ShortHeader) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HeadResponse_Body_ShortHeader.Merge(m, src)
-}
-func (m *HeadResponse_Body_ShortHeader) XXX_Size() int {
-	return m.Size()
-}
-func (m *HeadResponse_Body_ShortHeader) XXX_DiscardUnknown() {
-	xxx_messageInfo_HeadResponse_Body_ShortHeader.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_HeadResponse_Body_ShortHeader proto.InternalMessageInfo
-
-func (m *HeadResponse_Body_ShortHeader) GetVersion() *grpc.Version {
-	if m != nil {
-		return m.Version
-	}
-	return nil
-}
-
-func (m *HeadResponse_Body_ShortHeader) GetCreationEpoch() uint64 {
-	if m != nil {
-		return m.CreationEpoch
-	}
-	return 0
-}
-
-func (m *HeadResponse_Body_ShortHeader) GetOwnerId() *grpc1.OwnerID {
-	if m != nil {
-		return m.OwnerId
-	}
-	return nil
-}
-
-func (m *HeadResponse_Body_ShortHeader) GetObjectType() ObjectType {
-	if m != nil {
-		return m.ObjectType
-	}
-	return ObjectType_REGULAR
-}
-
-func (m *HeadResponse_Body_ShortHeader) GetPayloadLength() uint64 {
-	if m != nil {
-		return m.PayloadLength
-	}
-	return 0
-}
-
 // Search objects request
 type SearchRequest struct {
 	// Body of search object request message.
@@ -1533,7 +1419,7 @@ func (m *SearchRequest_Body) GetFilters() []*SearchRequest_Body_Filter {
 // Filter structure
 type SearchRequest_Body_Filter struct {
 	// Match type to use
-	MatchType SearchRequest_Body_Filter_MatchType `protobuf:"varint,1,opt,name=match_type,json=matchType,proto3,enum=neo.fs.v2.object.SearchRequest_Body_Filter_MatchType" json:"match_type,omitempty"`
+	MatchType MatchType `protobuf:"varint,1,opt,name=match_type,json=matchType,proto3,enum=neo.fs.v2.object.MatchType" json:"match_type,omitempty"`
 	// Header name to match
 	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	// Header value to match
@@ -1576,11 +1462,11 @@ func (m *SearchRequest_Body_Filter) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_SearchRequest_Body_Filter proto.InternalMessageInfo
 
-func (m *SearchRequest_Body_Filter) GetMatchType() SearchRequest_Body_Filter_MatchType {
+func (m *SearchRequest_Body_Filter) GetMatchType() MatchType {
 	if m != nil {
 		return m.MatchType
 	}
-	return SearchRequest_Body_Filter_MATCH_TYPE_UNSPECIFIED
+	return MatchType_MATCH_TYPE_UNSPECIFIED
 }
 
 func (m *SearchRequest_Body_Filter) GetName() string {
@@ -2276,7 +2162,6 @@ func (m *GetRangeHashResponse_Body) GetHashList() [][]byte {
 }
 
 func init() {
-	proto.RegisterEnum("neo.fs.v2.object.SearchRequest_Body_Filter_MatchType", SearchRequest_Body_Filter_MatchType_name, SearchRequest_Body_Filter_MatchType_value)
 	proto.RegisterType((*GetRequest)(nil), "neo.fs.v2.object.GetRequest")
 	proto.RegisterType((*GetRequest_Body)(nil), "neo.fs.v2.object.GetRequest.Body")
 	proto.RegisterType((*GetResponse)(nil), "neo.fs.v2.object.GetResponse")
@@ -2295,7 +2180,6 @@ func init() {
 	proto.RegisterType((*HeadRequest_Body)(nil), "neo.fs.v2.object.HeadRequest.Body")
 	proto.RegisterType((*HeadResponse)(nil), "neo.fs.v2.object.HeadResponse")
 	proto.RegisterType((*HeadResponse_Body)(nil), "neo.fs.v2.object.HeadResponse.Body")
-	proto.RegisterType((*HeadResponse_Body_ShortHeader)(nil), "neo.fs.v2.object.HeadResponse.Body.ShortHeader")
 	proto.RegisterType((*SearchRequest)(nil), "neo.fs.v2.object.SearchRequest")
 	proto.RegisterType((*SearchRequest_Body)(nil), "neo.fs.v2.object.SearchRequest.Body")
 	proto.RegisterType((*SearchRequest_Body_Filter)(nil), "neo.fs.v2.object.SearchRequest.Body.Filter")
@@ -2315,95 +2199,86 @@ func init() {
 func init() { proto.RegisterFile("v2/object/grpc/service.proto", fileDescriptor_1d7d92b1e85e5b48) }
 
 var fileDescriptor_1d7d92b1e85e5b48 = []byte{
-	// 1403 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0x4d, 0x73, 0xdb, 0x54,
-	0x17, 0x8e, 0x64, 0xc5, 0x89, 0x8f, 0xed, 0xbc, 0x99, 0xdb, 0x4e, 0x5f, 0x8f, 0x9a, 0x86, 0x54,
-	0x6d, 0xda, 0x0c, 0x25, 0x72, 0x30, 0x94, 0xd2, 0x96, 0x96, 0x49, 0x1a, 0xa7, 0xf1, 0xb4, 0x49,
-	0x53, 0x39, 0xed, 0x0c, 0xcc, 0x30, 0x1e, 0x45, 0xba, 0x8e, 0x05, 0xb6, 0x64, 0x74, 0x65, 0x77,
-	0xbc, 0x61, 0x05, 0x0b, 0xfe, 0x41, 0x87, 0x05, 0x30, 0x2c, 0xcb, 0x8e, 0x1f, 0xc0, 0x86, 0x0d,
-	0xec, 0x0a, 0xfc, 0x01, 0xa6, 0xac, 0x99, 0xfe, 0x03, 0x86, 0xb9, 0x1f, 0xb2, 0x2d, 0xd7, 0x5f,
-	0x64, 0x27, 0x76, 0xf7, 0xe3, 0x39, 0xc7, 0xf7, 0x3c, 0xf7, 0xb9, 0xe7, 0xdc, 0x2b, 0xc3, 0x52,
-	0xbb, 0x90, 0xf7, 0x8e, 0x3e, 0xc6, 0x56, 0x90, 0x3f, 0xf6, 0x9b, 0x56, 0x9e, 0x60, 0xbf, 0xed,
-	0x58, 0x58, 0x6f, 0xfa, 0x5e, 0xe0, 0xa1, 0x45, 0x17, 0x7b, 0x7a, 0x95, 0xe8, 0xed, 0x82, 0xce,
-	0x41, 0xaa, 0x3a, 0x80, 0x0f, 0x3a, 0x4d, 0x4c, 0x38, 0x5a, 0xcd, 0xb5, 0x0b, 0x79, 0x1f, 0x57,
-	0xc9, 0xab, 0x33, 0xd4, 0x4a, 0x78, 0xe6, 0x93, 0x0d, 0x1c, 0x98, 0x62, 0x6e, 0x69, 0x70, 0xae,
-	0x8d, 0x7d, 0xa7, 0xda, 0xe1, 0xb3, 0xda, 0x33, 0x19, 0xe0, 0x2e, 0x0e, 0x0c, 0xfc, 0x69, 0x0b,
-	0x93, 0x00, 0x5d, 0x05, 0xe5, 0xc8, 0xb3, 0x3b, 0x39, 0x69, 0x45, 0x5a, 0x4b, 0x17, 0xce, 0xeb,
-	0x83, 0xeb, 0xd3, 0x7b, 0x58, 0x7d, 0xcb, 0xb3, 0x3b, 0x06, 0x83, 0xa3, 0x22, 0xa4, 0xe9, 0x2f,
-	0x56, 0x6a, 0xd8, 0xb4, 0xb1, 0x9f, 0x93, 0x99, 0xf5, 0xc5, 0x3e, 0xeb, 0x30, 0x6c, 0x61, 0xbb,
-	0x87, 0x03, 0x73, 0x97, 0x61, 0x0d, 0x68, 0x74, 0xdb, 0xe8, 0x21, 0x64, 0xf9, 0xe2, 0x42, 0x47,
-	0x09, 0xe6, 0xe8, 0x8d, 0xd1, 0x8e, 0x1e, 0x53, 0xb8, 0x63, 0x99, 0x81, 0xe3, 0xb9, 0xc2, 0x61,
-	0x86, 0xbb, 0xe0, 0x3d, 0xf5, 0x1e, 0x28, 0x74, 0x9d, 0xe8, 0x4d, 0x98, 0x33, 0x6d, 0xdb, 0xc7,
-	0x84, 0x88, 0xd8, 0xfe, 0xdf, 0xe7, 0x94, 0x92, 0xaa, 0x6f, 0xf2, 0x69, 0x23, 0xc4, 0xa1, 0x45,
-	0x48, 0xf8, 0xe6, 0x13, 0x16, 0xcc, 0xbc, 0x41, 0x9b, 0xda, 0xdf, 0x09, 0x48, 0x33, 0x02, 0x48,
-	0xd3, 0x73, 0x09, 0x46, 0xef, 0x44, 0xd8, 0xd2, 0x46, 0xb0, 0xc5, 0xc1, 0xfd, 0x74, 0xed, 0x0c,
-	0xa3, 0x6b, 0x75, 0x68, 0x94, 0xdc, 0x78, 0x04, 0x5f, 0xc6, 0x70, 0xbe, 0xd6, 0xc7, 0x78, 0x9a,
-	0x48, 0xd8, 0x57, 0xb2, 0x60, 0xec, 0x16, 0x28, 0x8e, 0xeb, 0x04, 0x22, 0xb8, 0xcb, 0x93, 0x83,
-	0xd3, 0x4b, 0xae, 0x13, 0xec, 0xce, 0x18, 0xcc, 0x0c, 0x9d, 0x81, 0x59, 0xab, 0xd6, 0x72, 0x3f,
-	0x61, 0xd1, 0x65, 0x76, 0x67, 0x0c, 0xde, 0x55, 0xbf, 0x97, 0x40, 0xa1, 0x40, 0x74, 0x15, 0x52,
-	0xdc, 0x51, 0xc5, 0xb1, 0xc5, 0x8f, 0xe4, 0x06, 0xf7, 0xe4, 0x01, 0x03, 0x94, 0xb6, 0x8d, 0x79,
-	0x0e, 0x2d, 0xd9, 0xe8, 0x06, 0xa4, 0x88, 0x73, 0xec, 0x9a, 0x41, 0xcb, 0xc7, 0x82, 0xb9, 0xa5,
-	0x21, 0xf1, 0x96, 0x43, 0x8c, 0xd1, 0x83, 0xa3, 0x0d, 0x48, 0x46, 0x88, 0xca, 0xbd, 0x1a, 0x94,
-	0xe0, 0x44, 0xe0, 0xb6, 0xb2, 0x90, 0x16, 0x8b, 0x6c, 0x9a, 0x7e, 0xa0, 0x7d, 0xad, 0x00, 0x1c,
-	0xb4, 0xa6, 0x3f, 0x2d, 0x3d, 0x6c, 0x3c, 0x4e, 0xcb, 0x8f, 0xe1, 0xe6, 0xbf, 0x17, 0xd9, 0xfc,
-	0x4b, 0x13, 0x23, 0x9b, 0x6e, 0xef, 0x9f, 0xc7, 0x69, 0xef, 0xd1, 0x05, 0xc8, 0x5a, 0x5e, 0xd3,
-	0xc1, 0xa4, 0xe2, 0xb6, 0x1a, 0x47, 0xd8, 0xcf, 0x29, 0x2b, 0xd2, 0x5a, 0xd6, 0xc8, 0xf0, 0xc1,
-	0x7d, 0x36, 0x36, 0x28, 0x90, 0x6f, 0x65, 0x48, 0x33, 0x6a, 0xa6, 0xcd, 0x10, 0x7d, 0xe0, 0xb8,
-	0x64, 0x88, 0x5b, 0x42, 0x23, 0x27, 0xdb, 0x44, 0xed, 0x37, 0x19, 0xb2, 0xdb, 0xb8, 0x8e, 0x03,
-	0x1c, 0x1e, 0xa3, 0x77, 0x23, 0x24, 0x5d, 0x7c, 0x95, 0xa4, 0x08, 0x3c, 0x1e, 0x27, 0xa9, 0x71,
-	0xf2, 0xba, 0x53, 0x80, 0x79, 0xef, 0x89, 0x8b, 0x7d, 0x4a, 0xab, 0x3c, 0xdc, 0xe6, 0x01, 0x9d,
-	0x2f, 0x6d, 0x1b, 0x73, 0x0c, 0x58, 0xb2, 0xb5, 0x97, 0x12, 0x2c, 0x84, 0x2c, 0x09, 0xe9, 0x5d,
-	0x8f, 0xb0, 0xba, 0x3a, 0x9a, 0xd5, 0x78, 0xa9, 0x2f, 0xc9, 0x89, 0xd5, 0x7e, 0x91, 0x21, 0x4d,
-	0x87, 0x42, 0x11, 0x4d, 0x3c, 0x69, 0x7d, 0xe0, 0x78, 0x48, 0xa8, 0x76, 0x72, 0x09, 0x9d, 0x85,
-	0x54, 0xc3, 0x74, 0xdc, 0x8a, 0xe7, 0xd6, 0x3b, 0xe2, 0x02, 0x33, 0x4f, 0x07, 0x1e, 0xb8, 0xf5,
-	0x4e, 0x78, 0xaf, 0x49, 0xf4, 0xee, 0x35, 0x5f, 0xcc, 0x42, 0x86, 0xd3, 0x23, 0xb4, 0x73, 0x2d,
-	0x42, 0xe6, 0x85, 0x51, 0x64, 0xc6, 0x4b, 0x39, 0xdf, 0x24, 0x04, 0xa1, 0x85, 0x6e, 0x29, 0x90,
-	0xc6, 0x97, 0x82, 0xdd, 0x99, 0x6e, 0x31, 0x38, 0x84, 0x0c, 0xa9, 0x79, 0x7e, 0x10, 0x8d, 0x2c,
-	0x3f, 0x05, 0x33, 0x7a, 0x99, 0xda, 0x75, 0x1d, 0xa6, 0x49, 0xaf, 0xab, 0x7e, 0x2e, 0x43, 0xba,
-	0x6f, 0x1a, 0xbd, 0x0d, 0x73, 0x6d, 0xec, 0x13, 0xc7, 0x73, 0xc5, 0xd2, 0xd4, 0x21, 0x01, 0x3f,
-	0xe6, 0x08, 0x23, 0x84, 0xa2, 0x55, 0x58, 0xb0, 0x7c, 0xcc, 0x02, 0xaf, 0xe0, 0xa6, 0x67, 0xd5,
-	0xd8, 0xea, 0x14, 0x23, 0x1b, 0x8e, 0x16, 0xe9, 0x60, 0x24, 0xaf, 0x24, 0xa6, 0xcb, 0x2b, 0xe8,
-	0x56, 0xb7, 0xbc, 0xd1, 0xe7, 0x06, 0xab, 0x80, 0x0b, 0x91, 0x9a, 0x2b, 0xa2, 0xe6, 0x79, 0xfe,
-	0xb0, 0xd3, 0xc4, 0x06, 0x78, 0xdd, 0x36, 0x5d, 0x59, 0xd3, 0xec, 0xd4, 0x3d, 0xd3, 0xae, 0xd4,
-	0xb1, 0x7b, 0x1c, 0xd4, 0x72, 0xb3, 0x7c, 0x65, 0x62, 0xf4, 0x3e, 0x1b, 0xdc, 0x4a, 0x82, 0x42,
-	0x69, 0xd5, 0x7e, 0x57, 0x20, 0x5b, 0xc6, 0xa6, 0x6f, 0xd5, 0xa6, 0x2e, 0x0d, 0x11, 0x78, 0x3c,
-	0xce, 0xf5, 0x5f, 0xe1, 0x25, 0xeb, 0x36, 0x64, 0x2c, 0xcf, 0x0d, 0x4c, 0x47, 0x6c, 0x0a, 0x0f,
-	0xf2, 0xec, 0xe0, 0xa6, 0xdc, 0x09, 0x31, 0xa5, 0x6d, 0x23, 0xdd, 0x35, 0x28, 0xd9, 0x28, 0xd7,
-	0x53, 0x8b, 0xcc, 0xae, 0x26, 0x5d, 0x45, 0x14, 0x61, 0xae, 0xea, 0xd4, 0x03, 0xec, 0x93, 0x5c,
-	0x62, 0x25, 0xb1, 0x96, 0x2e, 0x5c, 0x99, 0x86, 0x39, 0x7d, 0x87, 0xd9, 0x18, 0xa1, 0xad, 0xfa,
-	0x93, 0x04, 0x49, 0x3e, 0x86, 0x0e, 0x01, 0x1a, 0x66, 0x60, 0xd5, 0xb8, 0x0e, 0x24, 0xa6, 0x83,
-	0xab, 0xff, 0xc2, 0xa9, 0xbe, 0x47, 0xad, 0x99, 0x40, 0x52, 0x8d, 0xb0, 0x89, 0x10, 0x28, 0xae,
-	0xd9, 0xe0, 0x77, 0xb9, 0x94, 0xc1, 0xda, 0xe8, 0x34, 0xcc, 0xb6, 0xcd, 0x7a, 0x0b, 0x33, 0xa6,
-	0x53, 0x06, 0xef, 0x68, 0xd7, 0x21, 0xd5, 0xf5, 0x80, 0x54, 0x38, 0xb3, 0xb7, 0x79, 0x78, 0x67,
-	0xb7, 0x72, 0xf8, 0xc1, 0x41, 0xb1, 0xf2, 0x68, 0xbf, 0x7c, 0x50, 0xbc, 0x53, 0xda, 0x29, 0x15,
-	0xb7, 0x17, 0x67, 0xd0, 0x22, 0x64, 0xca, 0x87, 0x46, 0x69, 0xff, 0x6e, 0xa5, 0xf8, 0xf0, 0xd1,
-	0xe6, 0xfd, 0x45, 0x49, 0xfb, 0x4e, 0x86, 0x85, 0x70, 0x5d, 0xd3, 0xd6, 0xc6, 0x28, 0x3e, 0x2e,
-	0x19, 0xee, 0x7a, 0xaf, 0x62, 0x38, 0x76, 0xa5, 0xee, 0x10, 0x7a, 0x81, 0x4f, 0x8c, 0xbd, 0x97,
-	0x25, 0x1d, 0xfb, 0xbe, 0x43, 0x02, 0xed, 0x1a, 0xcc, 0x1a, 0xa6, 0x7b, 0x8c, 0xd1, 0x19, 0x48,
-	0x7a, 0xd5, 0x2a, 0xc1, 0xfc, 0xee, 0xaf, 0x18, 0xa2, 0x47, 0xc7, 0xc5, 0x11, 0xe6, 0xc9, 0x45,
-	0xf4, 0xb4, 0x5f, 0x65, 0xf8, 0x1f, 0x7d, 0x09, 0x52, 0xe3, 0xf0, 0xd4, 0xde, 0x88, 0xd0, 0x7b,
-	0x69, 0xf8, 0xd3, 0xb1, 0xcf, 0xe0, 0x3f, 0x5f, 0x8f, 0xd7, 0x61, 0xd6, 0xa7, 0xf1, 0x0e, 0xb9,
-	0xcf, 0x09, 0x46, 0x38, 0x1d, 0x1c, 0xa5, 0x7d, 0x29, 0xc3, 0x62, 0x8f, 0x22, 0xa1, 0xd9, 0x9b,
-	0x11, 0x52, 0x2f, 0x8f, 0x23, 0x35, 0x5e, 0xaa, 0x5d, 0x12, 0xbc, 0x9e, 0x0e, 0x5f, 0x8d, 0x34,
-	0xc2, 0x8c, 0x78, 0x33, 0x6a, 0x2f, 0x65, 0x38, 0x15, 0x46, 0xb6, 0x6b, 0x92, 0x6e, 0x65, 0xb8,
-	0x1d, 0xa1, 0xe3, 0xf5, 0xd1, 0x74, 0xf4, 0x19, 0xc5, 0x43, 0x67, 0x9f, 0x9d, 0x5c, 0x67, 0x79,
-	0x48, 0x32, 0x05, 0x91, 0x9c, 0xcc, 0xce, 0xfd, 0x48, 0xa1, 0x09, 0x18, 0x4d, 0xc0, 0xc4, 0xac,
-	0x07, 0x6c, 0xd5, 0x19, 0x83, 0xb5, 0xb5, 0xa7, 0x32, 0x9c, 0x8e, 0x92, 0x27, 0x14, 0xf8, 0x7e,
-	0x84, 0xf2, 0x2b, 0x93, 0x28, 0x8f, 0x97, 0x0a, 0x2f, 0x08, 0xd6, 0xcf, 0x42, 0xaa, 0x66, 0x92,
-	0x5a, 0x2f, 0x7b, 0x66, 0x8c, 0x79, 0x3a, 0x40, 0xb3, 0x64, 0xe1, 0x07, 0x05, 0xb2, 0x3c, 0x75,
-	0x96, 0xb9, 0x7f, 0xb4, 0x0d, 0x89, 0xbb, 0x38, 0x40, 0x4b, 0xe3, 0xbe, 0x94, 0xaa, 0xe7, 0xc6,
-	0x7e, 0x3c, 0xdb, 0x90, 0xa8, 0x97, 0x83, 0xd6, 0x50, 0x2f, 0xbd, 0xef, 0x2c, 0xc3, 0xbc, 0xf4,
-	0x7d, 0x3d, 0x58, 0x93, 0xd0, 0x3d, 0x48, 0xf2, 0x37, 0x1d, 0x7a, 0x6d, 0xc2, 0x1b, 0x5a, 0x5d,
-	0x99, 0xf4, 0x1c, 0x44, 0x45, 0x50, 0x28, 0x33, 0xe8, 0xdc, 0xd8, 0x97, 0x94, 0xba, 0x3c, 0xfe,
-	0x06, 0x8c, 0xf6, 0x20, 0xc9, 0x6b, 0xe9, 0xb0, 0x35, 0x45, 0x6e, 0x0b, 0xc3, 0xd6, 0x14, 0x2d,
-	0xc3, 0x1b, 0x12, 0x2a, 0xc3, 0x7c, 0x28, 0x32, 0x74, 0x7e, 0x62, 0x5d, 0x51, 0xb5, 0xc9, 0x59,
-	0x72, 0x43, 0x42, 0x1f, 0x41, 0xa6, 0x5f, 0xb9, 0x68, 0x75, 0xaa, 0x64, 0xa2, 0x5e, 0x9a, 0xee,
-	0x00, 0x6c, 0x55, 0x7e, 0x7e, 0xb1, 0x2c, 0x3d, 0x7f, 0xb1, 0x2c, 0xfd, 0xf1, 0x62, 0x59, 0x7a,
-	0xfa, 0xe7, 0xf2, 0xcc, 0x87, 0xd7, 0x8e, 0x9d, 0xa0, 0xd6, 0x3a, 0xd2, 0x2d, 0xaf, 0x91, 0x77,
-	0x49, 0xd3, 0xb2, 0xd6, 0x6d, 0xdc, 0xce, 0xbb, 0xd8, 0xab, 0x92, 0x75, 0xb3, 0xe9, 0xac, 0x1f,
-	0x7b, 0xf9, 0xe8, 0xdf, 0x00, 0x37, 0x79, 0xfb, 0x99, 0x7c, 0x6a, 0x1f, 0x7b, 0x3b, 0x65, 0x7d,
-	0xf3, 0xa0, 0x44, 0x7f, 0x95, 0x4b, 0xf1, 0x28, 0xc9, 0x3e, 0xe5, 0xbf, 0xf5, 0x4f, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0x39, 0x31, 0x0a, 0x71, 0x6c, 0x18, 0x00, 0x00,
+	// 1258 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0x4d, 0x6f, 0x1b, 0x45,
+	0x18, 0xce, 0xae, 0x37, 0x8e, 0xfd, 0xda, 0x0e, 0xd1, 0x34, 0x2a, 0x96, 0xf3, 0x41, 0xba, 0x69,
+	0xd2, 0x88, 0x92, 0x75, 0x30, 0x2a, 0xa1, 0x29, 0x2d, 0x6a, 0x48, 0xd2, 0x58, 0x25, 0x4d, 0x58,
+	0x23, 0x0e, 0x48, 0xc8, 0xda, 0xec, 0x8e, 0xed, 0x05, 0x7b, 0xd7, 0xec, 0xac, 0x5d, 0xf9, 0xc2,
+	0x11, 0x89, 0x5f, 0x40, 0xc5, 0x01, 0x21, 0x8e, 0xe5, 0xc6, 0x0f, 0xe0, 0x0c, 0xb7, 0xc2, 0x2f,
+	0x40, 0xe1, 0x8a, 0xd4, 0x5f, 0x00, 0x42, 0xf3, 0xb1, 0xb6, 0xd7, 0xf1, 0x97, 0x72, 0xdb, 0xde,
+	0xe6, 0xe3, 0x79, 0xdf, 0x9d, 0xf7, 0x99, 0x67, 0xde, 0x79, 0x67, 0x61, 0xb9, 0x5d, 0xc8, 0xbb,
+	0xe7, 0x5f, 0x60, 0xd3, 0xcf, 0x57, 0xbd, 0xa6, 0x99, 0x27, 0xd8, 0x6b, 0xdb, 0x26, 0xd6, 0x9a,
+	0x9e, 0xeb, 0xbb, 0x68, 0xc1, 0xc1, 0xae, 0x56, 0x21, 0x5a, 0xbb, 0xa0, 0x71, 0x50, 0x2e, 0x37,
+	0x80, 0xf7, 0x3b, 0x4d, 0x4c, 0x38, 0x3a, 0x97, 0x6d, 0x17, 0xf2, 0x1e, 0xae, 0x90, 0xcb, 0x33,
+	0xd4, 0x4a, 0x78, 0xe6, 0x93, 0x0d, 0xec, 0x1b, 0x62, 0x6e, 0x79, 0x70, 0xae, 0x8d, 0x3d, 0xbb,
+	0xd2, 0xe1, 0xb3, 0xea, 0x73, 0x19, 0xe0, 0x11, 0xf6, 0x75, 0xfc, 0x55, 0x0b, 0x13, 0x1f, 0xdd,
+	0x01, 0xe5, 0xdc, 0xb5, 0x3a, 0x59, 0x69, 0x4d, 0xda, 0x4a, 0x15, 0x6e, 0x68, 0x83, 0xeb, 0xd3,
+	0x7a, 0x58, 0x6d, 0xdf, 0xb5, 0x3a, 0x3a, 0x83, 0xa3, 0x43, 0x48, 0xd1, 0x2f, 0x96, 0x6b, 0xd8,
+	0xb0, 0xb0, 0x97, 0x95, 0x99, 0xf5, 0xcd, 0x3e, 0xeb, 0x20, 0x6c, 0x61, 0x7b, 0x82, 0x7d, 0xe3,
+	0x98, 0x61, 0x75, 0x68, 0x74, 0xdb, 0xe8, 0x63, 0xc8, 0xf0, 0xc5, 0x05, 0x8e, 0x62, 0xcc, 0xd1,
+	0x5b, 0xa3, 0x1d, 0x7d, 0x4a, 0xe1, 0xb6, 0x69, 0xf8, 0xb6, 0xeb, 0x08, 0x87, 0x69, 0xee, 0x82,
+	0xf7, 0x72, 0x8f, 0x41, 0xa1, 0xeb, 0x44, 0x6f, 0xc3, 0x9c, 0x61, 0x59, 0x1e, 0x26, 0x44, 0xc4,
+	0xf6, 0x7a, 0x9f, 0x53, 0x4a, 0xaa, 0xf6, 0x90, 0x4f, 0xeb, 0x01, 0x0e, 0x2d, 0x40, 0xcc, 0x33,
+	0x9e, 0xb2, 0x60, 0x12, 0x3a, 0x6d, 0xaa, 0xff, 0xc5, 0x20, 0xc5, 0x08, 0x20, 0x4d, 0xd7, 0x21,
+	0x18, 0xbd, 0x1b, 0x62, 0x4b, 0x1d, 0xc1, 0x16, 0x07, 0xf7, 0xd3, 0x75, 0x34, 0x8c, 0xae, 0x8d,
+	0xa1, 0x51, 0x72, 0xe3, 0x11, 0x7c, 0xe9, 0xc3, 0xf9, 0xda, 0x1e, 0xe3, 0x69, 0x22, 0x61, 0xdf,
+	0xcb, 0x82, 0xb1, 0xfb, 0xa0, 0xd8, 0x8e, 0xed, 0x8b, 0xe0, 0x6e, 0x4d, 0x0e, 0x4e, 0x2b, 0x3a,
+	0xb6, 0x7f, 0x3c, 0xa3, 0x33, 0x33, 0x74, 0x1d, 0x66, 0xcd, 0x5a, 0xcb, 0xf9, 0x92, 0x45, 0x97,
+	0x3e, 0x9e, 0xd1, 0x79, 0x37, 0xf7, 0xb3, 0x04, 0x0a, 0x05, 0xa2, 0x3b, 0x90, 0xe4, 0x8e, 0xca,
+	0xb6, 0x25, 0x3e, 0x92, 0x1d, 0xdc, 0x93, 0x53, 0x06, 0x28, 0x1e, 0xe8, 0x09, 0x0e, 0x2d, 0x5a,
+	0x68, 0x0f, 0x92, 0xc4, 0xae, 0x3a, 0x86, 0xdf, 0xf2, 0xb0, 0x60, 0x6e, 0x79, 0x48, 0xbc, 0xa5,
+	0x00, 0xa3, 0xf7, 0xe0, 0x68, 0x07, 0xe2, 0x21, 0xa2, 0xb2, 0x97, 0x83, 0x12, 0x9c, 0x08, 0xdc,
+	0x7e, 0x06, 0x52, 0x62, 0x91, 0x4d, 0xc3, 0xf3, 0xd5, 0x1f, 0x14, 0x80, 0xb3, 0xd6, 0xf4, 0xa7,
+	0xa5, 0x87, 0x8d, 0xc6, 0x69, 0xf9, 0x35, 0xd8, 0xfc, 0xf7, 0x43, 0x9b, 0xbf, 0x39, 0x31, 0xb2,
+	0xe9, 0xf6, 0xfe, 0x45, 0x94, 0xf6, 0x1e, 0xad, 0x43, 0xc6, 0x74, 0x9b, 0x36, 0x26, 0x65, 0xa7,
+	0xd5, 0x38, 0xc7, 0x5e, 0x56, 0x59, 0x93, 0xb6, 0x32, 0x7a, 0x9a, 0x0f, 0x3e, 0x61, 0x63, 0x83,
+	0x02, 0xf9, 0x51, 0x86, 0x14, 0xa3, 0x66, 0xda, 0x0c, 0xd1, 0x07, 0x8e, 0x4a, 0x86, 0xb8, 0x2f,
+	0x34, 0x72, 0xb5, 0x4d, 0x54, 0xff, 0x94, 0x21, 0x73, 0x80, 0xeb, 0xd8, 0xc7, 0xc1, 0x31, 0x7a,
+	0x2f, 0x44, 0xd2, 0xcd, 0xcb, 0x24, 0x85, 0xe0, 0xd1, 0x38, 0x49, 0x8d, 0xab, 0xdf, 0x3b, 0x05,
+	0x48, 0xb8, 0x4f, 0x1d, 0xec, 0x51, 0x5a, 0xe5, 0xe1, 0x36, 0xa7, 0x74, 0xbe, 0x78, 0xa0, 0xcf,
+	0x31, 0x60, 0xd1, 0x52, 0x5f, 0x4a, 0x30, 0x1f, 0xb0, 0x24, 0xa4, 0x77, 0x37, 0xc4, 0xea, 0xc6,
+	0x68, 0x56, 0xa3, 0xa5, 0xbe, 0x38, 0x27, 0x56, 0xfd, 0x5d, 0x86, 0x14, 0x1d, 0x0a, 0x44, 0x34,
+	0xf1, 0xa4, 0xf5, 0x81, 0xa3, 0x21, 0xa1, 0xda, 0xd5, 0x25, 0xb4, 0x04, 0xc9, 0x86, 0x61, 0x3b,
+	0x65, 0xd7, 0xa9, 0x77, 0x44, 0x01, 0x93, 0xa0, 0x03, 0xa7, 0x4e, 0xbd, 0x13, 0xd4, 0x35, 0xb1,
+	0x5e, 0x5d, 0xf3, 0x8f, 0x0c, 0x69, 0x4e, 0x8f, 0xd0, 0xce, 0x6e, 0x88, 0xcc, 0xf5, 0x51, 0x64,
+	0x46, 0x4b, 0x39, 0xdf, 0x48, 0x82, 0xd0, 0x42, 0xf7, 0x2a, 0x90, 0xc6, 0x5f, 0x05, 0xc7, 0x33,
+	0xdd, 0xcb, 0x60, 0x1f, 0xd2, 0xa4, 0xe6, 0x7a, 0x7e, 0x38, 0xb2, 0x95, 0xcb, 0x96, 0x25, 0x8a,
+	0xea, 0x9a, 0xa7, 0x48, 0xaf, 0xbb, 0x1f, 0x07, 0x85, 0x5a, 0xab, 0xff, 0xc6, 0x20, 0x53, 0xc2,
+	0x86, 0x67, 0xd6, 0xa6, 0xce, 0x80, 0x21, 0x78, 0x34, 0xe4, 0xfb, 0x5d, 0x50, 0x4b, 0x3c, 0x80,
+	0xb4, 0xe9, 0x3a, 0xbe, 0x61, 0x8b, 0x9c, 0xc6, 0x83, 0x5c, 0x1a, 0x14, 0xf1, 0x87, 0x01, 0xa6,
+	0x78, 0xa0, 0xa7, 0xba, 0x06, 0x45, 0x0b, 0x65, 0x61, 0xae, 0x8d, 0x3d, 0x62, 0xbb, 0x0e, 0x0b,
+	0x2f, 0xa3, 0x07, 0x5d, 0x74, 0x08, 0x73, 0x15, 0xbb, 0xee, 0x63, 0x8f, 0x64, 0x63, 0x6b, 0xb1,
+	0xad, 0x54, 0xe1, 0xf6, 0x34, 0xcc, 0x69, 0x47, 0xcc, 0x46, 0x0f, 0x6c, 0x73, 0x0e, 0xc4, 0xf9,
+	0x10, 0xda, 0x03, 0x68, 0x18, 0xbe, 0x59, 0x2b, 0xd3, 0xc7, 0x15, 0x5b, 0xe8, 0x7c, 0x68, 0xa1,
+	0xc2, 0xe7, 0x09, 0xc5, 0x7c, 0xd2, 0x69, 0x62, 0x3d, 0xd9, 0x08, 0x9a, 0x08, 0x81, 0xe2, 0x18,
+	0x0d, 0x5e, 0x97, 0x24, 0x75, 0xd6, 0x46, 0x8b, 0x30, 0xdb, 0x36, 0xea, 0x2d, 0xcc, 0xe8, 0x4c,
+	0xea, 0xbc, 0xa3, 0xfe, 0x24, 0xc3, 0x7c, 0xb0, 0xac, 0x69, 0x93, 0x75, 0x18, 0x1f, 0x95, 0x23,
+	0x77, 0xb7, 0x97, 0xc2, 0x6c, 0xab, 0x5c, 0xb7, 0x09, 0xad, 0x28, 0x63, 0x63, 0x0b, 0x85, 0xb8,
+	0x6d, 0x7d, 0x64, 0x13, 0x5f, 0xdd, 0x85, 0x59, 0xdd, 0x70, 0xaa, 0x18, 0x5d, 0x87, 0xb8, 0x5b,
+	0xa9, 0x10, 0xcc, 0x8b, 0x51, 0x45, 0x17, 0x3d, 0x3a, 0x5e, 0xc7, 0x4e, 0xd5, 0xaf, 0xb1, 0x90,
+	0x15, 0x5d, 0xf4, 0xd4, 0x3f, 0x64, 0x78, 0x8d, 0x3e, 0x4d, 0xa8, 0x71, 0x70, 0xbe, 0xf6, 0x42,
+	0xf4, 0x6e, 0x0e, 0x7f, 0xcb, 0xf4, 0x19, 0xbc, 0xf2, 0x17, 0xc4, 0x36, 0xcc, 0x7a, 0x34, 0xde,
+	0x21, 0x05, 0x86, 0x60, 0x84, 0xd3, 0xc1, 0x51, 0xea, 0xb7, 0x32, 0x2c, 0xf4, 0x28, 0x12, 0x9a,
+	0xbd, 0x17, 0x22, 0xf5, 0xd6, 0x38, 0x52, 0xa3, 0xa5, 0xda, 0x65, 0xc1, 0xeb, 0x62, 0xf0, 0x8c,
+	0xa1, 0x11, 0xa6, 0xc5, 0x23, 0x46, 0x7d, 0x29, 0xc3, 0xb5, 0x20, 0xb2, 0x63, 0x83, 0x74, 0x73,
+	0xf8, 0x83, 0x10, 0x1d, 0x6f, 0x8e, 0xa6, 0xa3, 0xcf, 0x28, 0x1a, 0x3a, 0xfb, 0xfa, 0xea, 0x3a,
+	0xcb, 0x43, 0x9c, 0x29, 0x88, 0x64, 0x65, 0x76, 0xee, 0x47, 0x0a, 0x4d, 0xc0, 0x68, 0x16, 0x25,
+	0x46, 0xdd, 0x67, 0xab, 0x4e, 0xeb, 0xac, 0xad, 0x3e, 0x93, 0x61, 0x31, 0x4c, 0x9e, 0x50, 0xe0,
+	0x07, 0x21, 0xca, 0x6f, 0x4f, 0xa2, 0x3c, 0x5a, 0x2a, 0x5c, 0x17, 0xac, 0x2f, 0x41, 0xb2, 0x66,
+	0x90, 0x5a, 0x2f, 0x7b, 0xa6, 0xf5, 0x04, 0x1d, 0xa0, 0x59, 0xb2, 0xf0, 0x8b, 0x02, 0x19, 0x9e,
+	0x3a, 0x4b, 0xdc, 0x3f, 0x3a, 0x80, 0xd8, 0x23, 0xec, 0xa3, 0xe5, 0x71, 0xbf, 0xee, 0x72, 0x2b,
+	0x63, 0xff, 0xe6, 0xec, 0x48, 0xd4, 0xcb, 0x59, 0x6b, 0xa8, 0x97, 0xde, 0xc3, 0x7f, 0x98, 0x97,
+	0xbe, 0xe7, 0xec, 0x96, 0x84, 0x1e, 0x43, 0x9c, 0x3f, 0x32, 0xd0, 0x1b, 0x13, 0x1e, 0x75, 0xb9,
+	0xb5, 0x49, 0xef, 0x13, 0x74, 0x08, 0x0a, 0x65, 0x06, 0xad, 0x8c, 0x2d, 0xed, 0x73, 0xab, 0xe3,
+	0x8b, 0x55, 0x74, 0x02, 0x71, 0x7e, 0x97, 0x0e, 0x5b, 0x53, 0xa8, 0x58, 0x18, 0xb6, 0xa6, 0xf0,
+	0x35, 0xbc, 0x23, 0xa1, 0x12, 0x24, 0x02, 0x91, 0xa1, 0x1b, 0x13, 0xef, 0x95, 0x9c, 0x3a, 0x39,
+	0x4b, 0xee, 0x48, 0xe8, 0x73, 0x48, 0xf7, 0x2b, 0x17, 0x6d, 0x4c, 0x95, 0x4c, 0x72, 0x9b, 0xd3,
+	0x1d, 0x80, 0xfd, 0xf2, 0x6f, 0x17, 0xab, 0xd2, 0x8b, 0x8b, 0x55, 0xe9, 0xaf, 0x8b, 0x55, 0xe9,
+	0xd9, 0xdf, 0xab, 0x33, 0x9f, 0xed, 0x56, 0x6d, 0xbf, 0xd6, 0x3a, 0xd7, 0x4c, 0xb7, 0x91, 0x77,
+	0x48, 0xd3, 0x34, 0xb7, 0x2d, 0xdc, 0xce, 0x3b, 0xd8, 0xad, 0x90, 0x6d, 0xa3, 0x69, 0x6f, 0x57,
+	0xdd, 0x7c, 0xf8, 0xbf, 0xf4, 0x3d, 0xde, 0x7e, 0x2e, 0x5f, 0x7b, 0x82, 0xdd, 0xa3, 0x92, 0xf6,
+	0xf0, 0xac, 0x48, 0xbf, 0xca, 0xa5, 0x78, 0x1e, 0x67, 0xff, 0x96, 0xdf, 0xf9, 0x3f, 0x00, 0x00,
+	0xff, 0xff, 0x89, 0x37, 0x38, 0x06, 0xfd, 0x16, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -3931,12 +3806,12 @@ func (m *HeadResponse_Body_Header) MarshalToSizedBuffer(dAtA []byte) (int, error
 	}
 	return len(dAtA) - i, nil
 }
-func (m *HeadResponse_Body_ShortHeader_) MarshalTo(dAtA []byte) (int, error) {
+func (m *HeadResponse_Body_ShortHeader) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *HeadResponse_Body_ShortHeader_) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *HeadResponse_Body_ShortHeader) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	if m.ShortHeader != nil {
 		{
@@ -3952,72 +3827,6 @@ func (m *HeadResponse_Body_ShortHeader_) MarshalToSizedBuffer(dAtA []byte) (int,
 	}
 	return len(dAtA) - i, nil
 }
-func (m *HeadResponse_Body_ShortHeader) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *HeadResponse_Body_ShortHeader) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *HeadResponse_Body_ShortHeader) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
-	}
-	if m.PayloadLength != 0 {
-		i = encodeVarintService(dAtA, i, uint64(m.PayloadLength))
-		i--
-		dAtA[i] = 0x28
-	}
-	if m.ObjectType != 0 {
-		i = encodeVarintService(dAtA, i, uint64(m.ObjectType))
-		i--
-		dAtA[i] = 0x20
-	}
-	if m.OwnerId != nil {
-		{
-			size, err := m.OwnerId.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintService(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0x1a
-	}
-	if m.CreationEpoch != 0 {
-		i = encodeVarintService(dAtA, i, uint64(m.CreationEpoch))
-		i--
-		dAtA[i] = 0x10
-	}
-	if m.Version != nil {
-		{
-			size, err := m.Version.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintService(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
 func (m *SearchRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -5207,7 +5016,7 @@ func (m *HeadResponse_Body_Header) Size() (n int) {
 	}
 	return n
 }
-func (m *HeadResponse_Body_ShortHeader_) Size() (n int) {
+func (m *HeadResponse_Body_ShortHeader) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -5219,35 +5028,6 @@ func (m *HeadResponse_Body_ShortHeader_) Size() (n int) {
 	}
 	return n
 }
-func (m *HeadResponse_Body_ShortHeader) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.Version != nil {
-		l = m.Version.Size()
-		n += 1 + l + sovService(uint64(l))
-	}
-	if m.CreationEpoch != 0 {
-		n += 1 + sovService(uint64(m.CreationEpoch))
-	}
-	if m.OwnerId != nil {
-		l = m.OwnerId.Size()
-		n += 1 + l + sovService(uint64(l))
-	}
-	if m.ObjectType != 0 {
-		n += 1 + sovService(uint64(m.ObjectType))
-	}
-	if m.PayloadLength != 0 {
-		n += 1 + sovService(uint64(m.PayloadLength))
-	}
-	if m.XXX_unrecognized != nil {
-		n += len(m.XXX_unrecognized)
-	}
-	return n
-}
-
 func (m *SearchRequest) Size() (n int) {
 	if m == nil {
 		return 0
@@ -8048,11 +7828,11 @@ func (m *HeadResponse_Body) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			v := &HeadResponse_Body_ShortHeader{}
+			v := &ShortHeader{}
 			if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
-			m.Head = &HeadResponse_Body_ShortHeader_{v}
+			m.Head = &HeadResponse_Body_ShortHeader{v}
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
@@ -8079,189 +7859,6 @@ func (m *HeadResponse_Body) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *HeadResponse_Body_ShortHeader) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowService
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: ShortHeader: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: ShortHeader: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowService
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthService
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthService
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if m.Version == nil {
-				m.Version = &grpc.Version{}
-			}
-			if err := m.Version.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 2:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field CreationEpoch", wireType)
-			}
-			m.CreationEpoch = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowService
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.CreationEpoch |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		case 3:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field OwnerId", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowService
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthService
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthService
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if m.OwnerId == nil {
-				m.OwnerId = &grpc1.OwnerID{}
-			}
-			if err := m.OwnerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 4:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ObjectType", wireType)
-			}
-			m.ObjectType = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowService
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.ObjectType |= ObjectType(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		case 5:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field PayloadLength", wireType)
-			}
-			m.PayloadLength = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowService
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.PayloadLength |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		default:
-			iNdEx = preIndex
-			skippy, err := skipService(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if skippy < 0 {
-				return ErrInvalidLengthService
-			}
-			if (iNdEx + skippy) < 0 {
-				return ErrInvalidLengthService
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
 func (m *SearchRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
@@ -8610,7 +8207,7 @@ func (m *SearchRequest_Body_Filter) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				m.MatchType |= SearchRequest_Body_Filter_MatchType(b&0x7F) << shift
+				m.MatchType |= MatchType(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
diff --git a/v2/object/grpc/types.pb.go b/v2/object/grpc/types.pb.go
index f4617b0..2ba1d5a 100644
--- a/v2/object/grpc/types.pb.go
+++ b/v2/object/grpc/types.pb.go
@@ -6,8 +6,8 @@ package object
 import (
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	grpc "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc"
-	grpc1 "github.com/nspcc-dev/neofs-api-go/v2/service/grpc"
+	grpc1 "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc"
+	grpc "github.com/nspcc-dev/neofs-api-go/v2/service/grpc"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -56,17 +56,131 @@ func (ObjectType) EnumDescriptor() ([]byte, []int) {
 	return fileDescriptor_545319325da7b9b1, []int{0}
 }
 
+// Type of match expression
+type MatchType int32
+
+const (
+	// Unknown. Not used
+	MatchType_MATCH_TYPE_UNSPECIFIED MatchType = 0
+	// Full string match
+	MatchType_STRING_EQUAL MatchType = 1
+)
+
+var MatchType_name = map[int32]string{
+	0: "MATCH_TYPE_UNSPECIFIED",
+	1: "STRING_EQUAL",
+}
+
+var MatchType_value = map[string]int32{
+	"MATCH_TYPE_UNSPECIFIED": 0,
+	"STRING_EQUAL":           1,
+}
+
+func (x MatchType) String() string {
+	return proto.EnumName(MatchType_name, int32(x))
+}
+
+func (MatchType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_545319325da7b9b1, []int{1}
+}
+
+// Short header fields
+type ShortHeader struct {
+	// Object format version.
+	Version *grpc.Version `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"`
+	// Epoch when the object was created
+	CreationEpoch uint64 `protobuf:"varint,2,opt,name=creation_epoch,json=creationEpoch,proto3" json:"creation_epoch,omitempty"`
+	// Object's owner
+	OwnerId *grpc1.OwnerID `protobuf:"bytes,3,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"`
+	// Type of the object payload content
+	ObjectType ObjectType `protobuf:"varint,4,opt,name=object_type,json=objectType,proto3,enum=neo.fs.v2.object.ObjectType" json:"object_type,omitempty"`
+	// Size of payload in bytes.
+	// 0xFFFFFFFFFFFFFFFF means `payload_length` is unknown
+	PayloadLength        uint64   `protobuf:"varint,5,opt,name=payload_length,json=payloadLength,proto3" json:"payload_length,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ShortHeader) Reset()         { *m = ShortHeader{} }
+func (m *ShortHeader) String() string { return proto.CompactTextString(m) }
+func (*ShortHeader) ProtoMessage()    {}
+func (*ShortHeader) Descriptor() ([]byte, []int) {
+	return fileDescriptor_545319325da7b9b1, []int{0}
+}
+func (m *ShortHeader) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *ShortHeader) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_ShortHeader.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *ShortHeader) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ShortHeader.Merge(m, src)
+}
+func (m *ShortHeader) XXX_Size() int {
+	return m.Size()
+}
+func (m *ShortHeader) XXX_DiscardUnknown() {
+	xxx_messageInfo_ShortHeader.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ShortHeader proto.InternalMessageInfo
+
+func (m *ShortHeader) GetVersion() *grpc.Version {
+	if m != nil {
+		return m.Version
+	}
+	return nil
+}
+
+func (m *ShortHeader) GetCreationEpoch() uint64 {
+	if m != nil {
+		return m.CreationEpoch
+	}
+	return 0
+}
+
+func (m *ShortHeader) GetOwnerId() *grpc1.OwnerID {
+	if m != nil {
+		return m.OwnerId
+	}
+	return nil
+}
+
+func (m *ShortHeader) GetObjectType() ObjectType {
+	if m != nil {
+		return m.ObjectType
+	}
+	return ObjectType_REGULAR
+}
+
+func (m *ShortHeader) GetPayloadLength() uint64 {
+	if m != nil {
+		return m.PayloadLength
+	}
+	return 0
+}
+
 // Object Headers
 type Header struct {
-	// Object's container
-	ContainerId *grpc.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"`
-	// Object's owner
-	OwnerId *grpc.OwnerID `protobuf:"bytes,2,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"`
-	// Epoch when the object was created
-	CreationEpoch uint64 `protobuf:"varint,3,opt,name=creation_epoch,json=creationEpoch,proto3" json:"creation_epoch,omitempty"`
 	// Object format version.
 	// Effectively the version of API library used to create particular object
-	Version *grpc1.Version `protobuf:"bytes,4,opt,name=version,proto3" json:"version,omitempty"`
+	Version *grpc.Version `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"`
+	// Object's container
+	ContainerId *grpc1.ContainerID `protobuf:"bytes,2,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"`
+	// Object's owner
+	OwnerId *grpc1.OwnerID `protobuf:"bytes,3,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"`
+	// Object creation Epoch
+	CreationEpoch uint64 `protobuf:"varint,4,opt,name=creation_epoch,json=creationEpoch,proto3" json:"creation_epoch,omitempty"`
 	// Size of payload in bytes.
 	// 0xFFFFFFFFFFFFFFFF means `payload_length` is unknown
 	PayloadLength uint64 `protobuf:"varint,5,opt,name=payload_length,json=payloadLength,proto3" json:"payload_length,omitempty"`
@@ -78,7 +192,7 @@ type Header struct {
 	HomomorphicHash []byte `protobuf:"bytes,8,opt,name=homomorphic_hash,json=homomorphicHash,proto3" json:"homomorphic_hash,omitempty"`
 	// Session token, if it was used during Object creation.
 	// Need it to verify integrity and authenticity out of Request scope.
-	SessionToken *grpc1.SessionToken `protobuf:"bytes,9,opt,name=session_token,json=sessionToken,proto3" json:"session_token,omitempty"`
+	SessionToken *grpc.SessionToken `protobuf:"bytes,9,opt,name=session_token,json=sessionToken,proto3" json:"session_token,omitempty"`
 	// User-defined object attributes
 	Attributes []*Header_Attribute `protobuf:"bytes,10,rep,name=attributes,proto3" json:"attributes,omitempty"`
 	// Position of the object in the split hierarchy.
@@ -92,7 +206,7 @@ func (m *Header) Reset()         { *m = Header{} }
 func (m *Header) String() string { return proto.CompactTextString(m) }
 func (*Header) ProtoMessage()    {}
 func (*Header) Descriptor() ([]byte, []int) {
-	return fileDescriptor_545319325da7b9b1, []int{0}
+	return fileDescriptor_545319325da7b9b1, []int{1}
 }
 func (m *Header) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -121,14 +235,21 @@ func (m *Header) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_Header proto.InternalMessageInfo
 
-func (m *Header) GetContainerId() *grpc.ContainerID {
+func (m *Header) GetVersion() *grpc.Version {
+	if m != nil {
+		return m.Version
+	}
+	return nil
+}
+
+func (m *Header) GetContainerId() *grpc1.ContainerID {
 	if m != nil {
 		return m.ContainerId
 	}
 	return nil
 }
 
-func (m *Header) GetOwnerId() *grpc.OwnerID {
+func (m *Header) GetOwnerId() *grpc1.OwnerID {
 	if m != nil {
 		return m.OwnerId
 	}
@@ -142,13 +263,6 @@ func (m *Header) GetCreationEpoch() uint64 {
 	return 0
 }
 
-func (m *Header) GetVersion() *grpc1.Version {
-	if m != nil {
-		return m.Version
-	}
-	return nil
-}
-
 func (m *Header) GetPayloadLength() uint64 {
 	if m != nil {
 		return m.PayloadLength
@@ -177,7 +291,7 @@ func (m *Header) GetHomomorphicHash() []byte {
 	return nil
 }
 
-func (m *Header) GetSessionToken() *grpc1.SessionToken {
+func (m *Header) GetSessionToken() *grpc.SessionToken {
 	if m != nil {
 		return m.SessionToken
 	}
@@ -213,7 +327,7 @@ func (m *Header_Attribute) Reset()         { *m = Header_Attribute{} }
 func (m *Header_Attribute) String() string { return proto.CompactTextString(m) }
 func (*Header_Attribute) ProtoMessage()    {}
 func (*Header_Attribute) Descriptor() ([]byte, []int) {
-	return fileDescriptor_545319325da7b9b1, []int{0, 0}
+	return fileDescriptor_545319325da7b9b1, []int{1, 0}
 }
 func (m *Header_Attribute) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -261,25 +375,25 @@ type Header_Split struct {
 	// Identifier of the origin object.
 	// Parent and children objects must be within the same container.
 	// Parent object_id is known only to the minor child.
-	Parent *grpc.ObjectID `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	Parent *grpc1.ObjectID `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Previous carries identifier of the left split neighbor.
-	Previous *grpc.ObjectID `protobuf:"bytes,2,opt,name=previous,proto3" json:"previous,omitempty"`
+	Previous *grpc1.ObjectID `protobuf:"bytes,2,opt,name=previous,proto3" json:"previous,omitempty"`
 	// `signature` field of the parent object. Used to reconstruct parent.
-	ParentSignature *grpc1.Signature `protobuf:"bytes,3,opt,name=parent_signature,json=parentSignature,proto3" json:"parent_signature,omitempty"`
+	ParentSignature *grpc.Signature `protobuf:"bytes,3,opt,name=parent_signature,json=parentSignature,proto3" json:"parent_signature,omitempty"`
 	// `header` field of the parent object. Used to reconstruct parent.
 	ParentHeader *Header `protobuf:"bytes,4,opt,name=parent_header,json=parentHeader,proto3" json:"parent_header,omitempty"`
 	// Children carries list of identifiers of the objects generated by splitting the current.
-	Children             []*grpc.ObjectID `protobuf:"bytes,5,rep,name=children,proto3" json:"children,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
-	XXX_unrecognized     []byte           `json:"-"`
-	XXX_sizecache        int32            `json:"-"`
+	Children             []*grpc1.ObjectID `protobuf:"bytes,5,rep,name=children,proto3" json:"children,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
 func (m *Header_Split) Reset()         { *m = Header_Split{} }
 func (m *Header_Split) String() string { return proto.CompactTextString(m) }
 func (*Header_Split) ProtoMessage()    {}
 func (*Header_Split) Descriptor() ([]byte, []int) {
-	return fileDescriptor_545319325da7b9b1, []int{0, 1}
+	return fileDescriptor_545319325da7b9b1, []int{1, 1}
 }
 func (m *Header_Split) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -308,21 +422,21 @@ func (m *Header_Split) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_Header_Split proto.InternalMessageInfo
 
-func (m *Header_Split) GetParent() *grpc.ObjectID {
+func (m *Header_Split) GetParent() *grpc1.ObjectID {
 	if m != nil {
 		return m.Parent
 	}
 	return nil
 }
 
-func (m *Header_Split) GetPrevious() *grpc.ObjectID {
+func (m *Header_Split) GetPrevious() *grpc1.ObjectID {
 	if m != nil {
 		return m.Previous
 	}
 	return nil
 }
 
-func (m *Header_Split) GetParentSignature() *grpc1.Signature {
+func (m *Header_Split) GetParentSignature() *grpc.Signature {
 	if m != nil {
 		return m.ParentSignature
 	}
@@ -336,7 +450,7 @@ func (m *Header_Split) GetParentHeader() *Header {
 	return nil
 }
 
-func (m *Header_Split) GetChildren() []*grpc.ObjectID {
+func (m *Header_Split) GetChildren() []*grpc1.ObjectID {
 	if m != nil {
 		return m.Children
 	}
@@ -349,9 +463,9 @@ type Object struct {
 	// Object is content-addressed. It means id will change if header or payload
 	// changes. It's calculated as a hash of header field, which contains hash of
 	// object's payload
-	ObjectId *grpc.ObjectID `protobuf:"bytes,1,opt,name=object_id,json=objectId,proto3" json:"object_id,omitempty"`
+	ObjectId *grpc1.ObjectID `protobuf:"bytes,1,opt,name=object_id,json=objectId,proto3" json:"object_id,omitempty"`
 	// Signed object_id
-	Signature *grpc1.Signature `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"`
+	Signature *grpc.Signature `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"`
 	// Object metadata headers
 	Header *Header `protobuf:"bytes,3,opt,name=header,proto3" json:"header,omitempty"`
 	// Payload bytes.
@@ -365,7 +479,7 @@ func (m *Object) Reset()         { *m = Object{} }
 func (m *Object) String() string { return proto.CompactTextString(m) }
 func (*Object) ProtoMessage()    {}
 func (*Object) Descriptor() ([]byte, []int) {
-	return fileDescriptor_545319325da7b9b1, []int{1}
+	return fileDescriptor_545319325da7b9b1, []int{2}
 }
 func (m *Object) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -394,14 +508,14 @@ func (m *Object) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_Object proto.InternalMessageInfo
 
-func (m *Object) GetObjectId() *grpc.ObjectID {
+func (m *Object) GetObjectId() *grpc1.ObjectID {
 	if m != nil {
 		return m.ObjectId
 	}
 	return nil
 }
 
-func (m *Object) GetSignature() *grpc1.Signature {
+func (m *Object) GetSignature() *grpc.Signature {
 	if m != nil {
 		return m.Signature
 	}
@@ -424,6 +538,8 @@ func (m *Object) GetPayload() []byte {
 
 func init() {
 	proto.RegisterEnum("neo.fs.v2.object.ObjectType", ObjectType_name, ObjectType_value)
+	proto.RegisterEnum("neo.fs.v2.object.MatchType", MatchType_name, MatchType_value)
+	proto.RegisterType((*ShortHeader)(nil), "neo.fs.v2.object.ShortHeader")
 	proto.RegisterType((*Header)(nil), "neo.fs.v2.object.Header")
 	proto.RegisterType((*Header_Attribute)(nil), "neo.fs.v2.object.Header.Attribute")
 	proto.RegisterType((*Header_Split)(nil), "neo.fs.v2.object.Header.Split")
@@ -433,53 +549,124 @@ func init() {
 func init() { proto.RegisterFile("v2/object/grpc/types.proto", fileDescriptor_545319325da7b9b1) }
 
 var fileDescriptor_545319325da7b9b1 = []byte{
-	// 726 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xdd, 0x6e, 0xda, 0x48,
-	0x14, 0xc7, 0x63, 0x08, 0x5f, 0xc7, 0x90, 0xb0, 0xb3, 0x2b, 0xad, 0xc5, 0x46, 0x2c, 0x1b, 0x69,
-	0x25, 0x5a, 0x29, 0xa6, 0x22, 0x54, 0x95, 0x1a, 0xa5, 0x12, 0x69, 0x28, 0x41, 0x4a, 0x43, 0x34,
-	0x90, 0x5e, 0xf4, 0xc6, 0x32, 0xf6, 0x80, 0xdd, 0x80, 0xc7, 0xf2, 0x18, 0x47, 0xbc, 0x49, 0x9f,
-	0xa1, 0x52, 0x6f, 0xfa, 0x12, 0xed, 0x65, 0x1f, 0xa1, 0x4a, 0x5f, 0xa4, 0xf2, 0xcc, 0x18, 0x48,
-	0xd2, 0xa4, 0xbd, 0xf2, 0xcc, 0x99, 0xdf, 0xff, 0xcc, 0xf9, 0x1a, 0x43, 0x25, 0x6a, 0x36, 0xe8,
-	0xe8, 0x1d, 0xb1, 0xc2, 0xc6, 0x24, 0xf0, 0xad, 0x46, 0xb8, 0xf0, 0x09, 0xd3, 0xfd, 0x80, 0x86,
-	0x14, 0x95, 0x3d, 0x42, 0xf5, 0x31, 0xd3, 0xa3, 0xa6, 0x2e, 0x90, 0x8a, 0x16, 0x35, 0x1b, 0x01,
-	0x19, 0xb3, 0x3b, 0x6c, 0x25, 0xf6, 0xc3, 0x48, 0x10, 0xb9, 0x16, 0x11, 0x87, 0x33, 0x12, 0x9a,
-	0xf2, 0x6c, 0xe7, 0xf6, 0x59, 0x44, 0x02, 0x77, 0xbc, 0x10, 0xa7, 0xbb, 0x9f, 0x72, 0x90, 0x3d,
-	0x21, 0xa6, 0x4d, 0x02, 0xf4, 0x02, 0x8a, 0x16, 0xf5, 0x42, 0xd3, 0xf5, 0x48, 0x60, 0xb8, 0xb6,
-	0xa6, 0xd4, 0x94, 0xba, 0xda, 0xfc, 0x47, 0x5f, 0xc5, 0x11, 0x5f, 0xae, 0xbf, 0x4c, 0x98, 0xde,
-	0x31, 0x56, 0x97, 0x82, 0x9e, 0x8d, 0x9a, 0x90, 0xa7, 0x57, 0x52, 0x9b, 0xe2, 0xda, 0xbf, 0x6f,
-	0x6b, 0xfb, 0x57, 0x42, 0x97, 0xe3, 0x60, 0xcf, 0x46, 0xff, 0xc3, 0x96, 0x15, 0x10, 0x33, 0x74,
-	0xa9, 0x67, 0x10, 0x9f, 0x5a, 0x8e, 0x96, 0xae, 0x29, 0xf5, 0x4d, 0x5c, 0x4a, 0xac, 0x9d, 0xd8,
-	0x88, 0x5a, 0x90, 0x8b, 0x48, 0xc0, 0x5c, 0xea, 0x69, 0x9b, 0xdc, 0x73, 0x65, 0xcd, 0xb3, 0x4c,
-	0x4e, 0x7f, 0x23, 0x08, 0x9c, 0xa0, 0xb1, 0x73, 0xdf, 0x5c, 0x4c, 0xa9, 0x69, 0x1b, 0x53, 0xe2,
-	0x4d, 0x42, 0x47, 0xcb, 0x08, 0xe7, 0xd2, 0x7a, 0xca, 0x8d, 0xe8, 0x3f, 0x28, 0x26, 0x98, 0x63,
-	0x32, 0x47, 0xcb, 0xd6, 0x94, 0x7a, 0x11, 0xab, 0xd2, 0x76, 0x62, 0x32, 0x07, 0x1d, 0x82, 0x2a,
-	0x7a, 0x60, 0xc4, 0x55, 0xd7, 0x72, 0x35, 0xa5, 0xbe, 0xd5, 0xdc, 0xd1, 0x6f, 0x77, 0x48, 0xef,
-	0xf3, 0xcf, 0x70, 0xe1, 0x13, 0x0c, 0x74, 0xb9, 0x46, 0x8f, 0xa0, 0xec, 0xd0, 0x19, 0x9d, 0xd1,
-	0xc0, 0x77, 0x5c, 0x4b, 0xdc, 0x92, 0xe7, 0xb7, 0x6c, 0xaf, 0xd9, 0xf9, 0x4d, 0xc7, 0x50, 0x62,
-	0x84, 0xc5, 0xe1, 0x1b, 0x21, 0xbd, 0x24, 0x9e, 0x56, 0xe0, 0xf9, 0xfe, 0xfb, 0x93, 0x7c, 0x07,
-	0x82, 0x1b, 0xc6, 0x18, 0x2e, 0xb2, 0xb5, 0x1d, 0x3a, 0x02, 0x30, 0xc3, 0x30, 0x70, 0x47, 0xf3,
-	0x90, 0x30, 0x0d, 0x6a, 0xe9, 0xba, 0xda, 0xdc, 0xbd, 0x1b, 0xae, 0x68, 0xbc, 0xde, 0x4e, 0x50,
-	0xbc, 0xa6, 0x42, 0x2d, 0xc8, 0x30, 0x7f, 0xea, 0x86, 0x9a, 0xca, 0x23, 0xa8, 0xde, 0x2b, 0x1f,
-	0xc4, 0x14, 0x16, 0x70, 0x65, 0x1f, 0x0a, 0x4b, 0x77, 0xa8, 0x0c, 0xe9, 0x4b, 0xb2, 0xe0, 0x83,
-	0x54, 0xc0, 0xf1, 0x12, 0xfd, 0x05, 0x99, 0xc8, 0x9c, 0xce, 0x09, 0x1f, 0x90, 0x02, 0x16, 0x9b,
-	0xca, 0xc7, 0x14, 0x64, 0xb8, 0x17, 0xf4, 0x04, 0xb2, 0xbe, 0x19, 0x10, 0x2f, 0x94, 0xd3, 0xa7,
-	0xdd, 0x99, 0x20, 0x7e, 0x75, 0xef, 0x18, 0x4b, 0x0e, 0xb5, 0x20, 0xef, 0x07, 0x24, 0x72, 0xe9,
-	0x9c, 0xc9, 0xa9, 0xbb, 0x5f, 0xb3, 0x24, 0x51, 0x17, 0xca, 0x42, 0x6f, 0x30, 0x77, 0xe2, 0x99,
-	0xe1, 0x3c, 0x20, 0x7c, 0xf2, 0xd4, 0x1b, 0x5d, 0x5d, 0x56, 0x3a, 0x61, 0xf0, 0xb6, 0x50, 0x2d,
-	0x0d, 0xe8, 0x10, 0x4a, 0xd2, 0x91, 0xc3, 0xab, 0x21, 0xe7, 0x53, 0xbb, 0xaf, 0x5a, 0xb8, 0x28,
-	0x70, 0xf9, 0xe6, 0x5a, 0x90, 0xb7, 0x1c, 0x77, 0x6a, 0x07, 0xc4, 0xd3, 0x32, 0xbc, 0x4d, 0x0f,
-	0x44, 0x9f, 0x90, 0xbb, 0x9f, 0x15, 0xc8, 0x0a, 0x33, 0x7a, 0x0a, 0x05, 0x39, 0x99, 0xcb, 0x17,
-	0xfb, 0x80, 0x07, 0x81, 0xf6, 0x6c, 0xf4, 0x1c, 0x0a, 0xab, 0xc4, 0x53, 0xbf, 0x91, 0xf8, 0x0a,
-	0x8f, 0x7b, 0x24, 0x73, 0x4d, 0xff, 0x22, 0x57, 0xc9, 0x21, 0x0d, 0x72, 0xf2, 0x35, 0xf1, 0xf2,
-	0x14, 0x71, 0xb2, 0x7d, 0x7c, 0x00, 0xb0, 0x7a, 0x33, 0x48, 0x85, 0x1c, 0xee, 0x74, 0x2f, 0x4e,
-	0xdb, 0xb8, 0xbc, 0x81, 0x4a, 0x50, 0x18, 0xf6, 0x5f, 0x1f, 0x0d, 0x86, 0xfd, 0xb3, 0x4e, 0x59,
-	0x41, 0x7f, 0x40, 0x69, 0x30, 0xec, 0xe3, 0x76, 0xb7, 0x63, 0x74, 0x71, 0xff, 0xe2, 0xbc, 0x9c,
-	0x3a, 0x32, 0xbe, 0x5c, 0x57, 0x95, 0xaf, 0xd7, 0x55, 0xe5, 0xdb, 0x75, 0x55, 0x79, 0xff, 0xbd,
-	0xba, 0xf1, 0xf6, 0xd9, 0xc4, 0x0d, 0x9d, 0xf9, 0x48, 0xb7, 0xe8, 0xac, 0xe1, 0x31, 0xdf, 0xb2,
-	0xf6, 0x6c, 0x12, 0x35, 0x3c, 0x42, 0xc7, 0x6c, 0xcf, 0xf4, 0xdd, 0xbd, 0x09, 0x6d, 0xdc, 0xfc,
-	0xe3, 0x1e, 0x88, 0xf5, 0x87, 0xd4, 0x9f, 0x67, 0x84, 0xbe, 0x1a, 0xe8, 0xed, 0xf3, 0x5e, 0x9c,
-	0x86, 0x88, 0x69, 0x94, 0xe5, 0xff, 0xc8, 0xfd, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x65, 0x74,
-	0xce, 0xc4, 0xa7, 0x05, 0x00, 0x00,
+	// 808 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xdd, 0x6e, 0xe3, 0x44,
+	0x14, 0xc7, 0xeb, 0xb4, 0xf9, 0x3a, 0x49, 0x76, 0xcd, 0x80, 0xc0, 0x0a, 0x55, 0x08, 0x95, 0x90,
+	0xc2, 0x4a, 0x75, 0x50, 0xb6, 0x08, 0xc1, 0x6a, 0x91, 0xd2, 0xc6, 0x9b, 0x5a, 0x6a, 0x9b, 0x32,
+	0x76, 0x91, 0xe0, 0xc6, 0x72, 0xed, 0x69, 0x6c, 0x36, 0xf5, 0x58, 0x33, 0x13, 0xa3, 0xdc, 0xf3,
+	0x10, 0x3c, 0x03, 0x12, 0x37, 0xbc, 0x04, 0x5c, 0xf2, 0x08, 0xa8, 0xbc, 0x08, 0xf2, 0x8c, 0x9d,
+	0x7e, 0x2e, 0xbb, 0xb0, 0x57, 0x9e, 0x39, 0xf3, 0x3b, 0x67, 0xce, 0xf9, 0x9f, 0x33, 0x32, 0x74,
+	0xb3, 0xd1, 0x90, 0x9e, 0xff, 0x40, 0x02, 0x31, 0x9c, 0xb3, 0x34, 0x18, 0x8a, 0x55, 0x4a, 0xb8,
+	0x99, 0x32, 0x2a, 0x28, 0xd2, 0x13, 0x42, 0xcd, 0x0b, 0x6e, 0x66, 0x23, 0x53, 0x21, 0x5d, 0x23,
+	0x1b, 0x0d, 0x19, 0xb9, 0xe0, 0xf7, 0xd8, 0x6e, 0x1e, 0x87, 0x13, 0x96, 0xc5, 0x01, 0x51, 0x87,
+	0x97, 0x44, 0xf8, 0xc5, 0xd9, 0xf6, 0xdd, 0xb3, 0x8c, 0xb0, 0xf8, 0x62, 0xa5, 0x4e, 0x77, 0x7e,
+	0xaa, 0x40, 0xcb, 0x89, 0x28, 0x13, 0x87, 0xc4, 0x0f, 0x09, 0x43, 0x7b, 0x50, 0xcf, 0x08, 0xe3,
+	0x31, 0x4d, 0x0c, 0xad, 0xaf, 0x0d, 0x5a, 0xa3, 0xae, 0x79, 0x9d, 0x47, 0x11, 0xc6, 0xfc, 0x56,
+	0x11, 0xb8, 0x44, 0xd1, 0x27, 0xf0, 0x28, 0x60, 0xc4, 0x17, 0x31, 0x4d, 0x3c, 0x92, 0xd2, 0x20,
+	0x32, 0x2a, 0x7d, 0x6d, 0xb0, 0x85, 0x3b, 0xa5, 0xd5, 0xca, 0x8d, 0x68, 0x04, 0x0d, 0xfa, 0x63,
+	0x42, 0x98, 0x17, 0x87, 0xc6, 0xa6, 0x8c, 0xfe, 0xc1, 0x8d, 0xe8, 0x79, 0x69, 0xe6, 0x2c, 0x3f,
+	0xb7, 0x27, 0xb8, 0x2e, 0x41, 0x3b, 0x44, 0xcf, 0xa1, 0xa5, 0xca, 0xf7, 0xf2, 0x82, 0x8d, 0xad,
+	0xbe, 0x36, 0x78, 0x34, 0xda, 0x36, 0xef, 0x8a, 0x63, 0xce, 0xe4, 0xc7, 0x5d, 0xa5, 0x04, 0x03,
+	0x5d, 0xaf, 0xf3, 0xcc, 0x52, 0x7f, 0xb5, 0xa0, 0x7e, 0xe8, 0x2d, 0x48, 0x32, 0x17, 0x91, 0x51,
+	0x55, 0x99, 0x15, 0xd6, 0x23, 0x69, 0xdc, 0xf9, 0xad, 0x0e, 0xb5, 0xb7, 0x52, 0xe0, 0x6b, 0x68,
+	0x07, 0x34, 0x11, 0x7e, 0x5c, 0x94, 0x57, 0x91, 0xae, 0x1f, 0xde, 0x2d, 0xef, 0xa0, 0x64, 0xec,
+	0x09, 0x6e, 0xad, 0x1d, 0xec, 0xf0, 0x7f, 0x49, 0x73, 0x5f, 0xf5, 0xad, 0x87, 0x54, 0x7f, 0x33,
+	0x09, 0xd0, 0xc7, 0xd0, 0x2e, 0xb1, 0xc8, 0xe7, 0x91, 0x51, 0xeb, 0x6b, 0x83, 0x36, 0x6e, 0x15,
+	0xb6, 0x43, 0x9f, 0x47, 0x77, 0x7b, 0x51, 0xff, 0x8f, 0xbd, 0xf8, 0x14, 0xf4, 0x88, 0x5e, 0xd2,
+	0x4b, 0xca, 0xd2, 0x28, 0x0e, 0xd4, 0x2d, 0x0d, 0x79, 0xcb, 0xe3, 0x1b, 0x76, 0x79, 0xd3, 0x04,
+	0x3a, 0x9c, 0xf0, 0x5c, 0x59, 0x4f, 0xd0, 0x97, 0x24, 0x31, 0x9a, 0x52, 0x93, 0x8f, 0x1e, 0x68,
+	0x85, 0xa3, 0x38, 0x37, 0xc7, 0x70, 0x9b, 0xdf, 0xd8, 0xa1, 0x7d, 0x00, 0x5f, 0x08, 0x16, 0x9f,
+	0x2f, 0x05, 0xe1, 0x06, 0xf4, 0x37, 0x07, 0xad, 0xd1, 0xce, 0xfd, 0x74, 0x55, 0xe3, 0xcd, 0x71,
+	0x89, 0xe2, 0x1b, 0x5e, 0x68, 0x0f, 0xaa, 0x3c, 0x5d, 0xc4, 0xc2, 0x68, 0xc9, 0x0c, 0x7a, 0xaf,
+	0x74, 0x77, 0x72, 0x0a, 0x2b, 0xb8, 0xfb, 0x14, 0x9a, 0xeb, 0x70, 0x48, 0x87, 0xcd, 0x97, 0x64,
+	0x25, 0xa7, 0xa9, 0x89, 0xf3, 0x25, 0x7a, 0x0f, 0xaa, 0x99, 0xbf, 0x58, 0x12, 0x39, 0x26, 0x4d,
+	0xac, 0x36, 0xdd, 0x5f, 0x2b, 0x50, 0x95, 0x51, 0xd0, 0x67, 0x50, 0x4b, 0x7d, 0x46, 0x12, 0x51,
+	0x8c, 0xa0, 0x71, 0x6f, 0x16, 0xe4, 0xd5, 0xf6, 0x04, 0x17, 0x1c, 0xda, 0x83, 0x46, 0xca, 0x48,
+	0x16, 0xd3, 0x25, 0x2f, 0x66, 0xef, 0xd5, 0x3e, 0x6b, 0x12, 0x4d, 0x41, 0x57, 0xfe, 0x1e, 0x8f,
+	0xe7, 0x89, 0x2f, 0x96, 0x8c, 0x14, 0xd3, 0xb7, 0xfd, 0x90, 0xd2, 0x25, 0x83, 0x1f, 0x2b, 0xaf,
+	0xb5, 0x01, 0x3d, 0x87, 0x4e, 0x11, 0x28, 0x92, 0x6a, 0xc8, 0x49, 0xbc, 0x9d, 0xc3, 0x2d, 0xb5,
+	0x70, 0x5b, 0xe1, 0xeb, 0x37, 0xd7, 0x08, 0xa2, 0x78, 0x11, 0x32, 0x92, 0x18, 0x55, 0xd9, 0xa6,
+	0x7f, 0xc9, 0xbe, 0x24, 0x77, 0x7e, 0xd7, 0xa0, 0xa6, 0xcc, 0xe8, 0x73, 0x68, 0x16, 0x93, 0x19,
+	0x87, 0xaf, 0xd5, 0xac, 0xa1, 0x50, 0x3b, 0x44, 0x5f, 0x41, 0xf3, 0xba, 0xf0, 0xca, 0x1b, 0x14,
+	0x7e, 0x8d, 0xe7, 0x3d, 0x2a, 0x6a, 0xdd, 0x7c, 0x4d, 0xad, 0x05, 0x87, 0x0c, 0xa8, 0x17, 0xaf,
+	0x49, 0xca, 0xd3, 0xc6, 0xe5, 0xf6, 0xc9, 0x33, 0x80, 0xeb, 0x37, 0x83, 0x5a, 0x50, 0xc7, 0xd6,
+	0xf4, 0xec, 0x68, 0x8c, 0xf5, 0x0d, 0xd4, 0x81, 0xa6, 0x3b, 0x3b, 0xde, 0x77, 0xdc, 0xd9, 0x89,
+	0xa5, 0x6b, 0xe8, 0x1d, 0xe8, 0x38, 0xee, 0x0c, 0x8f, 0xa7, 0x96, 0x37, 0xc5, 0xb3, 0xb3, 0x53,
+	0xbd, 0xf2, 0xe4, 0x4b, 0x68, 0x1e, 0xfb, 0x22, 0x88, 0xa4, 0x6f, 0x17, 0xde, 0x3f, 0x1e, 0xbb,
+	0x07, 0x87, 0x9e, 0xfb, 0xdd, 0xa9, 0xe5, 0x9d, 0x9d, 0x38, 0xa7, 0xd6, 0x81, 0xfd, 0xc2, 0xb6,
+	0x26, 0xfa, 0x06, 0xd2, 0xa1, 0xed, 0xb8, 0xd8, 0x3e, 0x99, 0x7a, 0xd6, 0x37, 0x67, 0xe3, 0x23,
+	0x5d, 0xdb, 0xf7, 0xfe, 0xb8, 0xea, 0x69, 0x7f, 0x5e, 0xf5, 0xb4, 0xbf, 0xae, 0x7a, 0xda, 0xcf,
+	0x7f, 0xf7, 0x36, 0xbe, 0xff, 0x62, 0x1e, 0x8b, 0x68, 0x79, 0x6e, 0x06, 0xf4, 0x72, 0x98, 0xf0,
+	0x34, 0x08, 0x76, 0x43, 0x92, 0x0d, 0x13, 0x42, 0x2f, 0xf8, 0xae, 0x9f, 0xc6, 0xbb, 0x73, 0x3a,
+	0xbc, 0xfd, 0xcf, 0x7a, 0xa6, 0xd6, 0xbf, 0x54, 0xde, 0x3d, 0x21, 0xf4, 0x85, 0x63, 0x8e, 0x4f,
+	0xed, 0x5c, 0x01, 0x55, 0xce, 0x79, 0x4d, 0xfe, 0x65, 0x9e, 0xfe, 0x13, 0x00, 0x00, 0xff, 0xff,
+	0x47, 0xd1, 0x60, 0xa2, 0xe9, 0x06, 0x00, 0x00,
+}
+
+func (m *ShortHeader) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *ShortHeader) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *ShortHeader) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.XXX_unrecognized != nil {
+		i -= len(m.XXX_unrecognized)
+		copy(dAtA[i:], m.XXX_unrecognized)
+	}
+	if m.PayloadLength != 0 {
+		i = encodeVarintTypes(dAtA, i, uint64(m.PayloadLength))
+		i--
+		dAtA[i] = 0x28
+	}
+	if m.ObjectType != 0 {
+		i = encodeVarintTypes(dAtA, i, uint64(m.ObjectType))
+		i--
+		dAtA[i] = 0x20
+	}
+	if m.OwnerId != nil {
+		{
+			size, err := m.OwnerId.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintTypes(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x1a
+	}
+	if m.CreationEpoch != 0 {
+		i = encodeVarintTypes(dAtA, i, uint64(m.CreationEpoch))
+		i--
+		dAtA[i] = 0x10
+	}
+	if m.Version != nil {
+		{
+			size, err := m.Version.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintTypes(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
 }
 
 func (m *Header) Marshal() (dAtA []byte, err error) {
@@ -568,22 +755,10 @@ func (m *Header) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x28
 	}
-	if m.Version != nil {
-		{
-			size, err := m.Version.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintTypes(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0x22
-	}
 	if m.CreationEpoch != 0 {
 		i = encodeVarintTypes(dAtA, i, uint64(m.CreationEpoch))
 		i--
-		dAtA[i] = 0x18
+		dAtA[i] = 0x20
 	}
 	if m.OwnerId != nil {
 		{
@@ -595,7 +770,7 @@ func (m *Header) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintTypes(dAtA, i, uint64(size))
 		}
 		i--
-		dAtA[i] = 0x12
+		dAtA[i] = 0x1a
 	}
 	if m.ContainerId != nil {
 		{
@@ -607,6 +782,18 @@ func (m *Header) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintTypes(dAtA, i, uint64(size))
 		}
 		i--
+		dAtA[i] = 0x12
+	}
+	if m.Version != nil {
+		{
+			size, err := m.Version.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintTypes(dAtA, i, uint64(size))
+		}
+		i--
 		dAtA[i] = 0xa
 	}
 	return len(dAtA) - i, nil
@@ -823,12 +1010,45 @@ func encodeVarintTypes(dAtA []byte, offset int, v uint64) int {
 	dAtA[offset] = uint8(v)
 	return base
 }
+func (m *ShortHeader) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.Version != nil {
+		l = m.Version.Size()
+		n += 1 + l + sovTypes(uint64(l))
+	}
+	if m.CreationEpoch != 0 {
+		n += 1 + sovTypes(uint64(m.CreationEpoch))
+	}
+	if m.OwnerId != nil {
+		l = m.OwnerId.Size()
+		n += 1 + l + sovTypes(uint64(l))
+	}
+	if m.ObjectType != 0 {
+		n += 1 + sovTypes(uint64(m.ObjectType))
+	}
+	if m.PayloadLength != 0 {
+		n += 1 + sovTypes(uint64(m.PayloadLength))
+	}
+	if m.XXX_unrecognized != nil {
+		n += len(m.XXX_unrecognized)
+	}
+	return n
+}
+
 func (m *Header) Size() (n int) {
 	if m == nil {
 		return 0
 	}
 	var l int
 	_ = l
+	if m.Version != nil {
+		l = m.Version.Size()
+		n += 1 + l + sovTypes(uint64(l))
+	}
 	if m.ContainerId != nil {
 		l = m.ContainerId.Size()
 		n += 1 + l + sovTypes(uint64(l))
@@ -840,10 +1060,6 @@ func (m *Header) Size() (n int) {
 	if m.CreationEpoch != 0 {
 		n += 1 + sovTypes(uint64(m.CreationEpoch))
 	}
-	if m.Version != nil {
-		l = m.Version.Size()
-		n += 1 + l + sovTypes(uint64(l))
-	}
 	if m.PayloadLength != 0 {
 		n += 1 + sovTypes(uint64(m.PayloadLength))
 	}
@@ -966,6 +1182,189 @@ func sovTypes(x uint64) (n int) {
 func sozTypes(x uint64) (n int) {
 	return sovTypes(uint64((x << 1) ^ uint64((int64(x) >> 63))))
 }
+func (m *ShortHeader) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowTypes
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: ShortHeader: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: ShortHeader: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTypes
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTypes
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Version == nil {
+				m.Version = &grpc.Version{}
+			}
+			if err := m.Version.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 2:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field CreationEpoch", wireType)
+			}
+			m.CreationEpoch = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.CreationEpoch |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field OwnerId", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTypes
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTypes
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.OwnerId == nil {
+				m.OwnerId = &grpc1.OwnerID{}
+			}
+			if err := m.OwnerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 4:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ObjectType", wireType)
+			}
+			m.ObjectType = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.ObjectType |= ObjectType(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 5:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field PayloadLength", wireType)
+			}
+			m.PayloadLength = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.PayloadLength |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		default:
+			iNdEx = preIndex
+			skippy, err := skipTypes(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if skippy < 0 {
+				return ErrInvalidLengthTypes
+			}
+			if (iNdEx + skippy) < 0 {
+				return ErrInvalidLengthTypes
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func (m *Header) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
@@ -996,6 +1395,42 @@ func (m *Header) Unmarshal(dAtA []byte) error {
 		}
 		switch fieldNum {
 		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTypes
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTypes
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Version == nil {
+				m.Version = &grpc.Version{}
+			}
+			if err := m.Version.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 2:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field ContainerId", wireType)
 			}
@@ -1025,13 +1460,13 @@ func (m *Header) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.ContainerId == nil {
-				m.ContainerId = &grpc.ContainerID{}
+				m.ContainerId = &grpc1.ContainerID{}
 			}
 			if err := m.ContainerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
-		case 2:
+		case 3:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field OwnerId", wireType)
 			}
@@ -1061,13 +1496,13 @@ func (m *Header) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.OwnerId == nil {
-				m.OwnerId = &grpc.OwnerID{}
+				m.OwnerId = &grpc1.OwnerID{}
 			}
 			if err := m.OwnerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
-		case 3:
+		case 4:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field CreationEpoch", wireType)
 			}
@@ -1086,42 +1521,6 @@ func (m *Header) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
-		case 4:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTypes
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthTypes
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if m.Version == nil {
-				m.Version = &grpc1.Version{}
-			}
-			if err := m.Version.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
 		case 5:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field PayloadLength", wireType)
@@ -1258,7 +1657,7 @@ func (m *Header) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.SessionToken == nil {
-				m.SessionToken = &grpc1.SessionToken{}
+				m.SessionToken = &grpc.SessionToken{}
 			}
 			if err := m.SessionToken.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -1536,7 +1935,7 @@ func (m *Header_Split) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.Parent == nil {
-				m.Parent = &grpc.ObjectID{}
+				m.Parent = &grpc1.ObjectID{}
 			}
 			if err := m.Parent.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -1572,7 +1971,7 @@ func (m *Header_Split) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.Previous == nil {
-				m.Previous = &grpc.ObjectID{}
+				m.Previous = &grpc1.ObjectID{}
 			}
 			if err := m.Previous.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -1608,7 +2007,7 @@ func (m *Header_Split) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.ParentSignature == nil {
-				m.ParentSignature = &grpc1.Signature{}
+				m.ParentSignature = &grpc.Signature{}
 			}
 			if err := m.ParentSignature.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -1679,7 +2078,7 @@ func (m *Header_Split) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Children = append(m.Children, &grpc.ObjectID{})
+			m.Children = append(m.Children, &grpc1.ObjectID{})
 			if err := m.Children[len(m.Children)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
@@ -1768,7 +2167,7 @@ func (m *Object) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.ObjectId == nil {
-				m.ObjectId = &grpc.ObjectID{}
+				m.ObjectId = &grpc1.ObjectID{}
 			}
 			if err := m.ObjectId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -1804,7 +2203,7 @@ func (m *Object) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.Signature == nil {
-				m.Signature = &grpc1.Signature{}
+				m.Signature = &grpc.Signature{}
 			}
 			if err := m.Signature.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
diff --git a/v2/service/grpc/meta.pb.go b/v2/service/grpc/meta.pb.go
index 397dc3a..5c8c90f 100644
--- a/v2/service/grpc/meta.pb.go
+++ b/v2/service/grpc/meta.pb.go
@@ -24,56 +24,56 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
-// Verb is an enumeration of session request types
-type SessionToken_Body_Verb int32
+// Object request verbs
+type ObjectServiceContext_Verb int32
 
 const (
 	// Unknown verb
-	SessionToken_Body_VERB_UNSPECIFIED SessionToken_Body_Verb = 0
+	ObjectServiceContext_VERB_UNSPECIFIED ObjectServiceContext_Verb = 0
 	// Refers to object.Put RPC call
-	SessionToken_Body_OBJECT_PUT SessionToken_Body_Verb = 1
+	ObjectServiceContext_PUT ObjectServiceContext_Verb = 1
 	// Refers to object.Get RPC call
-	SessionToken_Body_OBJECT_GET SessionToken_Body_Verb = 2
+	ObjectServiceContext_GET ObjectServiceContext_Verb = 2
 	// Refers to object.Head RPC call
-	SessionToken_Body_OBJECT_HEAD SessionToken_Body_Verb = 3
+	ObjectServiceContext_HEAD ObjectServiceContext_Verb = 3
 	// Refers to object.Search RPC call
-	SessionToken_Body_OBJECT_SEARCH SessionToken_Body_Verb = 4
+	ObjectServiceContext_SEARCH ObjectServiceContext_Verb = 4
 	// Refers to object.Delete RPC call
-	SessionToken_Body_OBJECT_DELETE SessionToken_Body_Verb = 5
+	ObjectServiceContext_DELETE ObjectServiceContext_Verb = 5
 	// Refers to object.GetRange RPC call
-	SessionToken_Body_OBJECT_RANGE SessionToken_Body_Verb = 6
+	ObjectServiceContext_RANGE ObjectServiceContext_Verb = 6
 	// Refers to object.GetRangeHash RPC call
-	SessionToken_Body_OBJECT_RANGEHASH SessionToken_Body_Verb = 7
+	ObjectServiceContext_RANGEHASH ObjectServiceContext_Verb = 7
 )
 
-var SessionToken_Body_Verb_name = map[int32]string{
+var ObjectServiceContext_Verb_name = map[int32]string{
 	0: "VERB_UNSPECIFIED",
-	1: "OBJECT_PUT",
-	2: "OBJECT_GET",
-	3: "OBJECT_HEAD",
-	4: "OBJECT_SEARCH",
-	5: "OBJECT_DELETE",
-	6: "OBJECT_RANGE",
-	7: "OBJECT_RANGEHASH",
+	1: "PUT",
+	2: "GET",
+	3: "HEAD",
+	4: "SEARCH",
+	5: "DELETE",
+	6: "RANGE",
+	7: "RANGEHASH",
 }
 
-var SessionToken_Body_Verb_value = map[string]int32{
+var ObjectServiceContext_Verb_value = map[string]int32{
 	"VERB_UNSPECIFIED": 0,
-	"OBJECT_PUT":       1,
-	"OBJECT_GET":       2,
-	"OBJECT_HEAD":      3,
-	"OBJECT_SEARCH":    4,
-	"OBJECT_DELETE":    5,
-	"OBJECT_RANGE":     6,
-	"OBJECT_RANGEHASH": 7,
+	"PUT":              1,
+	"GET":              2,
+	"HEAD":             3,
+	"SEARCH":           4,
+	"DELETE":           5,
+	"RANGE":            6,
+	"RANGEHASH":        7,
 }
 
-func (x SessionToken_Body_Verb) String() string {
-	return proto.EnumName(SessionToken_Body_Verb_name, int32(x))
+func (x ObjectServiceContext_Verb) String() string {
+	return proto.EnumName(ObjectServiceContext_Verb_name, int32(x))
 }
 
-func (SessionToken_Body_Verb) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_174eb6ef9ee2b356, []int{3, 0, 0}
+func (ObjectServiceContext_Verb) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_174eb6ef9ee2b356, []int{3, 0}
 }
 
 // Extended headers for Request/Response
@@ -259,6 +259,64 @@ func (m *TokenLifetime) GetIat() uint64 {
 	return 0
 }
 
+// Context information for Session Tokens related to ObjectService requests
+type ObjectServiceContext struct {
+	// Verb is a type of request for which the token is issued
+	Verb ObjectServiceContext_Verb `protobuf:"varint,1,opt,name=verb,proto3,enum=neo.fs.v2.service.ObjectServiceContext_Verb" json:"verb,omitempty"`
+	// Related Object address
+	Address              *grpc.Address `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *ObjectServiceContext) Reset()         { *m = ObjectServiceContext{} }
+func (m *ObjectServiceContext) String() string { return proto.CompactTextString(m) }
+func (*ObjectServiceContext) ProtoMessage()    {}
+func (*ObjectServiceContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_174eb6ef9ee2b356, []int{3}
+}
+func (m *ObjectServiceContext) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *ObjectServiceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_ObjectServiceContext.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *ObjectServiceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ObjectServiceContext.Merge(m, src)
+}
+func (m *ObjectServiceContext) XXX_Size() int {
+	return m.Size()
+}
+func (m *ObjectServiceContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_ObjectServiceContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ObjectServiceContext proto.InternalMessageInfo
+
+func (m *ObjectServiceContext) GetVerb() ObjectServiceContext_Verb {
+	if m != nil {
+		return m.Verb
+	}
+	return ObjectServiceContext_VERB_UNSPECIFIED
+}
+
+func (m *ObjectServiceContext) GetAddress() *grpc.Address {
+	if m != nil {
+		return m.Address
+	}
+	return nil
+}
+
 // NeoFS session token.
 type SessionToken struct {
 	// Session Token body
@@ -274,7 +332,7 @@ func (m *SessionToken) Reset()         { *m = SessionToken{} }
 func (m *SessionToken) String() string { return proto.CompactTextString(m) }
 func (*SessionToken) ProtoMessage()    {}
 func (*SessionToken) Descriptor() ([]byte, []int) {
-	return fileDescriptor_174eb6ef9ee2b356, []int{3}
+	return fileDescriptor_174eb6ef9ee2b356, []int{4}
 }
 func (m *SessionToken) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -323,16 +381,14 @@ type SessionToken_Body struct {
 	Id []byte `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// OwnerID carries identifier of the session initiator.
 	OwnerId *grpc.OwnerID `protobuf:"bytes,2,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"`
-	// Verb is a type of request for which the token is issued
-	Verb SessionToken_Body_Verb `protobuf:"varint,3,opt,name=verb,proto3,enum=neo.fs.v2.service.SessionToken_Body_Verb" json:"verb,omitempty"`
 	// Lifetime is a lifetime of the session
-	Lifetime *TokenLifetime `protobuf:"bytes,4,opt,name=lifetime,proto3" json:"lifetime,omitempty"`
+	Lifetime *TokenLifetime `protobuf:"bytes,3,opt,name=lifetime,proto3" json:"lifetime,omitempty"`
 	// SessionKey is a public key of session key
-	SessionKey []byte `protobuf:"bytes,5,opt,name=session_key,json=sessionKey,proto3" json:"session_key,omitempty"`
+	SessionKey []byte `protobuf:"bytes,4,opt,name=session_key,json=sessionKey,proto3" json:"session_key,omitempty"`
 	// Carries context of the session.
 	//
 	// Types that are valid to be assigned to Context:
-	//	*SessionToken_Body_ObjectAddress
+	//	*SessionToken_Body_ObjectService
 	Context              isSessionToken_Body_Context `protobuf_oneof:"context"`
 	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
 	XXX_unrecognized     []byte                      `json:"-"`
@@ -343,7 +399,7 @@ func (m *SessionToken_Body) Reset()         { *m = SessionToken_Body{} }
 func (m *SessionToken_Body) String() string { return proto.CompactTextString(m) }
 func (*SessionToken_Body) ProtoMessage()    {}
 func (*SessionToken_Body) Descriptor() ([]byte, []int) {
-	return fileDescriptor_174eb6ef9ee2b356, []int{3, 0}
+	return fileDescriptor_174eb6ef9ee2b356, []int{4, 0}
 }
 func (m *SessionToken_Body) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -378,11 +434,11 @@ type isSessionToken_Body_Context interface {
 	Size() int
 }
 
-type SessionToken_Body_ObjectAddress struct {
-	ObjectAddress *grpc.Address `protobuf:"bytes,6,opt,name=object_address,json=objectAddress,proto3,oneof" json:"object_address,omitempty"`
+type SessionToken_Body_ObjectService struct {
+	ObjectService *ObjectServiceContext `protobuf:"bytes,5,opt,name=object_service,json=objectService,proto3,oneof" json:"object_service,omitempty"`
 }
 
-func (*SessionToken_Body_ObjectAddress) isSessionToken_Body_Context() {}
+func (*SessionToken_Body_ObjectService) isSessionToken_Body_Context() {}
 
 func (m *SessionToken_Body) GetContext() isSessionToken_Body_Context {
 	if m != nil {
@@ -405,13 +461,6 @@ func (m *SessionToken_Body) GetOwnerId() *grpc.OwnerID {
 	return nil
 }
 
-func (m *SessionToken_Body) GetVerb() SessionToken_Body_Verb {
-	if m != nil {
-		return m.Verb
-	}
-	return SessionToken_Body_VERB_UNSPECIFIED
-}
-
 func (m *SessionToken_Body) GetLifetime() *TokenLifetime {
 	if m != nil {
 		return m.Lifetime
@@ -426,9 +475,9 @@ func (m *SessionToken_Body) GetSessionKey() []byte {
 	return nil
 }
 
-func (m *SessionToken_Body) GetObjectAddress() *grpc.Address {
-	if x, ok := m.GetContext().(*SessionToken_Body_ObjectAddress); ok {
-		return x.ObjectAddress
+func (m *SessionToken_Body) GetObjectService() *ObjectServiceContext {
+	if x, ok := m.GetContext().(*SessionToken_Body_ObjectService); ok {
+		return x.ObjectService
 	}
 	return nil
 }
@@ -436,7 +485,7 @@ func (m *SessionToken_Body) GetObjectAddress() *grpc.Address {
 // XXX_OneofWrappers is for the internal use of the proto package.
 func (*SessionToken_Body) XXX_OneofWrappers() []interface{} {
 	return []interface{}{
-		(*SessionToken_Body_ObjectAddress)(nil),
+		(*SessionToken_Body_ObjectService)(nil),
 	}
 }
 
@@ -455,7 +504,7 @@ func (m *BearerToken) Reset()         { *m = BearerToken{} }
 func (m *BearerToken) String() string { return proto.CompactTextString(m) }
 func (*BearerToken) ProtoMessage()    {}
 func (*BearerToken) Descriptor() ([]byte, []int) {
-	return fileDescriptor_174eb6ef9ee2b356, []int{4}
+	return fileDescriptor_174eb6ef9ee2b356, []int{5}
 }
 func (m *BearerToken) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -515,7 +564,7 @@ func (m *BearerToken_Body) Reset()         { *m = BearerToken_Body{} }
 func (m *BearerToken_Body) String() string { return proto.CompactTextString(m) }
 func (*BearerToken_Body) ProtoMessage()    {}
 func (*BearerToken_Body) Descriptor() ([]byte, []int) {
-	return fileDescriptor_174eb6ef9ee2b356, []int{4, 0}
+	return fileDescriptor_174eb6ef9ee2b356, []int{5, 0}
 }
 func (m *BearerToken_Body) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -590,7 +639,7 @@ func (m *RequestMetaHeader) Reset()         { *m = RequestMetaHeader{} }
 func (m *RequestMetaHeader) String() string { return proto.CompactTextString(m) }
 func (*RequestMetaHeader) ProtoMessage()    {}
 func (*RequestMetaHeader) Descriptor() ([]byte, []int) {
-	return fileDescriptor_174eb6ef9ee2b356, []int{5}
+	return fileDescriptor_174eb6ef9ee2b356, []int{6}
 }
 func (m *RequestMetaHeader) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -689,7 +738,7 @@ func (m *ResponseMetaHeader) Reset()         { *m = ResponseMetaHeader{} }
 func (m *ResponseMetaHeader) String() string { return proto.CompactTextString(m) }
 func (*ResponseMetaHeader) ProtoMessage()    {}
 func (*ResponseMetaHeader) Descriptor() ([]byte, []int) {
-	return fileDescriptor_174eb6ef9ee2b356, []int{6}
+	return fileDescriptor_174eb6ef9ee2b356, []int{7}
 }
 func (m *ResponseMetaHeader) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -754,10 +803,11 @@ func (m *ResponseMetaHeader) GetOrigin() *ResponseMetaHeader {
 }
 
 func init() {
-	proto.RegisterEnum("neo.fs.v2.service.SessionToken_Body_Verb", SessionToken_Body_Verb_name, SessionToken_Body_Verb_value)
+	proto.RegisterEnum("neo.fs.v2.service.ObjectServiceContext_Verb", ObjectServiceContext_Verb_name, ObjectServiceContext_Verb_value)
 	proto.RegisterType((*XHeader)(nil), "neo.fs.v2.service.XHeader")
 	proto.RegisterType((*Version)(nil), "neo.fs.v2.service.Version")
 	proto.RegisterType((*TokenLifetime)(nil), "neo.fs.v2.service.TokenLifetime")
+	proto.RegisterType((*ObjectServiceContext)(nil), "neo.fs.v2.service.ObjectServiceContext")
 	proto.RegisterType((*SessionToken)(nil), "neo.fs.v2.service.SessionToken")
 	proto.RegisterType((*SessionToken_Body)(nil), "neo.fs.v2.service.SessionToken.Body")
 	proto.RegisterType((*BearerToken)(nil), "neo.fs.v2.service.BearerToken")
@@ -769,60 +819,60 @@ func init() {
 func init() { proto.RegisterFile("v2/service/grpc/meta.proto", fileDescriptor_174eb6ef9ee2b356) }
 
 var fileDescriptor_174eb6ef9ee2b356 = []byte{
-	// 838 bytes of a gzipped FileDescriptorProto
+	// 846 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0xcd, 0x6e, 0x23, 0x45,
-	0x10, 0xce, 0xd8, 0x93, 0x38, 0x2e, 0xdb, 0x61, 0xd2, 0x8a, 0xb4, 0x23, 0x6b, 0xe5, 0x8d, 0x0c,
-	0x48, 0x70, 0xc8, 0x58, 0x0c, 0xa0, 0xf0, 0xb3, 0x2b, 0x61, 0xc7, 0xb3, 0x6b, 0x43, 0xc8, 0x46,
-	0x6d, 0x6f, 0x84, 0xb8, 0x58, 0xf3, 0x53, 0x76, 0x66, 0xd7, 0x99, 0x36, 0xd3, 0x93, 0x21, 0x7e,
-	0x13, 0x24, 0xde, 0x80, 0x1b, 0x17, 0x9e, 0x81, 0x23, 0x12, 0x37, 0x4e, 0x28, 0xdc, 0xb8, 0xf1,
-	0x06, 0xa8, 0x7f, 0xbc, 0xcc, 0x26, 0x5e, 0xfe, 0xc4, 0x81, 0x5b, 0xd5, 0xd7, 0x5f, 0x55, 0x75,
-	0x55, 0x7f, 0x53, 0x03, 0xcd, 0xdc, 0xed, 0x70, 0x4c, 0xf3, 0x38, 0xc4, 0xce, 0x2c, 0x5d, 0x84,
-	0x9d, 0x0b, 0xcc, 0x7c, 0x67, 0x91, 0xb2, 0x8c, 0x91, 0xdd, 0x04, 0x99, 0x33, 0xe5, 0x4e, 0xee,
-	0x3a, 0x9a, 0xd2, 0xbc, 0x93, 0xbb, 0x1d, 0x3f, 0x9c, 0x2b, 0x6a, 0xb6, 0x5c, 0x20, 0x57, 0xdc,
-	0xa6, 0x9d, 0xbb, 0x9d, 0x14, 0xa7, 0xfc, 0xf6, 0xc9, 0xdd, 0x9b, 0x15, 0x72, 0x4c, 0xe3, 0xe9,
-	0x52, 0x9d, 0xb6, 0xdf, 0x82, 0xca, 0x67, 0x03, 0xf4, 0x23, 0x4c, 0x89, 0x05, 0xe5, 0x67, 0xb8,
-	0xb4, 0x8d, 0x7d, 0xe3, 0x8d, 0x2a, 0x15, 0x26, 0xd9, 0x83, 0xcd, 0xdc, 0x9f, 0x5f, 0xa2, 0x5d,
-	0x92, 0x98, 0x72, 0xda, 0xef, 0x42, 0xe5, 0x0c, 0x53, 0x1e, 0xb3, 0x44, 0x10, 0x2e, 0xfc, 0xa7,
-	0x2c, 0x95, 0x41, 0x0d, 0xaa, 0x1c, 0x89, 0xc6, 0x09, 0x4b, 0x65, 0x98, 0x40, 0x85, 0xd3, 0xf6,
-	0xa0, 0x31, 0x66, 0xcf, 0x30, 0x39, 0x8e, 0xa7, 0x98, 0xc5, 0x17, 0x28, 0xea, 0xe1, 0xd5, 0x42,
-	0x86, 0x9a, 0x54, 0x98, 0x02, 0x49, 0x82, 0xa9, 0x0c, 0x33, 0xa9, 0x30, 0x05, 0x12, 0xfb, 0x99,
-	0x5d, 0x56, 0x48, 0xec, 0x67, 0xed, 0x9f, 0x4c, 0xa8, 0x8f, 0x90, 0x8b, 0xf2, 0x32, 0x1d, 0x79,
-	0x0f, 0xcc, 0x80, 0x45, 0xea, 0xde, 0x35, 0xf7, 0x35, 0xe7, 0xd6, 0xd0, 0x9c, 0x22, 0xdd, 0xe9,
-	0xb1, 0x68, 0x49, 0x65, 0x04, 0xf9, 0x00, 0xaa, 0x3c, 0x9e, 0x25, 0x7e, 0x76, 0x99, 0xaa, 0x16,
-	0x6b, 0xee, 0xdd, 0x75, 0xe1, 0x2b, 0x0e, 0xfd, 0x83, 0xde, 0xfc, 0xb1, 0x0c, 0xa6, 0x48, 0x45,
-	0x76, 0xa0, 0x14, 0x47, 0xb2, 0x78, 0x9d, 0x96, 0xe2, 0x88, 0xb8, 0xb0, 0xcd, 0xbe, 0x4c, 0x30,
-	0x9d, 0xc4, 0x91, 0xce, 0x79, 0xa7, 0x90, 0x53, 0x3c, 0x91, 0xf3, 0x58, 0x9c, 0x0f, 0xfb, 0xb4,
-	0x22, 0x89, 0xc3, 0x88, 0x3c, 0x00, 0x33, 0xc7, 0x34, 0x90, 0x6d, 0xee, 0xb8, 0x6f, 0xfe, 0x9d,
-	0x16, 0x9c, 0x33, 0x4c, 0x03, 0x2a, 0xc3, 0xc8, 0x7d, 0xd8, 0x9e, 0xeb, 0xa1, 0xda, 0xa6, 0x2c,
-	0xb9, 0xbf, 0x26, 0xc5, 0x0b, 0xc3, 0xa7, 0xcf, 0x23, 0xc8, 0x3d, 0xa8, 0x71, 0x95, 0x7d, 0x22,
-	0x9e, 0x7f, 0x53, 0x76, 0x02, 0x1a, 0xfa, 0x04, 0x97, 0xe4, 0x23, 0xd8, 0x61, 0xc1, 0x53, 0x0c,
-	0xb3, 0x89, 0x1f, 0x45, 0x29, 0x72, 0x6e, 0x6f, 0xad, 0xef, 0xab, 0xab, 0x8e, 0x07, 0x1b, 0xb4,
-	0xa1, 0x02, 0x34, 0xd0, 0xfe, 0xda, 0x00, 0x53, 0xdc, 0x97, 0xec, 0x81, 0x75, 0xe6, 0xd1, 0xde,
-	0xe4, 0xc9, 0xc9, 0xe8, 0xd4, 0x3b, 0x1a, 0x3e, 0x1c, 0x7a, 0x7d, 0x6b, 0x83, 0xec, 0x00, 0x3c,
-	0xee, 0x7d, 0xec, 0x1d, 0x8d, 0x27, 0xa7, 0x4f, 0xc6, 0x96, 0x51, 0xf0, 0x1f, 0x79, 0x63, 0xab,
-	0x44, 0x5e, 0x81, 0x9a, 0xf6, 0x07, 0x5e, 0xb7, 0x6f, 0x95, 0xc9, 0x2e, 0x34, 0x34, 0x30, 0xf2,
-	0xba, 0xf4, 0x68, 0x60, 0x99, 0x05, 0xa8, 0xef, 0x1d, 0x7b, 0x63, 0xcf, 0xda, 0x24, 0x16, 0xd4,
-	0x35, 0x44, 0xbb, 0x27, 0x8f, 0x3c, 0x6b, 0x4b, 0x94, 0x2f, 0x22, 0x83, 0xee, 0x68, 0x60, 0x55,
-	0x7a, 0x55, 0xa8, 0x84, 0x2c, 0xc9, 0xf0, 0x2a, 0x6b, 0x7f, 0x57, 0x82, 0x5a, 0x0f, 0xfd, 0x14,
-	0x53, 0xa5, 0xad, 0xc3, 0x17, 0xb4, 0xf5, 0xea, 0x9a, 0xa9, 0x16, 0xd8, 0xff, 0x95, 0xb4, 0xbe,
-	0x35, 0xb4, 0xb4, 0x0e, 0x01, 0xd0, 0x0f, 0xe7, 0x93, 0xcc, 0x0f, 0xe6, 0xa8, 0xef, 0x60, 0x17,
-	0xb2, 0xf8, 0xe1, 0xdc, 0xf1, 0xba, 0x47, 0xc7, 0x63, 0x71, 0x4e, 0xab, 0x82, 0x2b, 0xcd, 0x7f,
-	0xa5, 0xc1, 0xa2, 0x88, 0xca, 0xff, 0x54, 0x44, 0xed, 0xdf, 0x4a, 0xb0, 0x4b, 0xf1, 0x8b, 0x4b,
-	0xe4, 0xd9, 0xa7, 0x98, 0xf9, 0x7a, 0xa3, 0xbc, 0x03, 0x95, 0x5c, 0x6d, 0x0a, 0x7d, 0xfb, 0xe6,
-	0x9a, 0x94, 0x7a, 0x97, 0xd0, 0x15, 0x55, 0xac, 0x0f, 0x5c, 0xb0, 0xf0, 0x5c, 0xef, 0x01, 0xe5,
-	0x88, 0x4d, 0x90, 0x65, 0x73, 0x79, 0xb5, 0x06, 0x15, 0x26, 0x39, 0x84, 0xea, 0xd5, 0xe4, 0x5c,
-	0x56, 0xe2, 0xb6, 0xb9, 0x5f, 0x7e, 0x49, 0x7e, 0xbd, 0xde, 0xe8, 0xf6, 0x95, 0x32, 0x38, 0xe9,
-	0x43, 0x63, 0xa5, 0xf8, 0x4c, 0xf4, 0x23, 0x35, 0x5f, 0x73, 0xef, 0xfd, 0xc5, 0x77, 0x47, 0xeb,
-	0xbc, 0xb8, 0x77, 0xba, 0x50, 0x0f, 0xe4, 0xe3, 0xeb, 0x24, 0xea, 0xa3, 0x68, 0xfd, 0xb9, 0x46,
-	0x68, 0x2d, 0x28, 0xc8, 0xeb, 0x3e, 0x6c, 0xb1, 0x34, 0x9e, 0xc5, 0x89, 0x5d, 0x79, 0xe9, 0xf2,
-	0xba, 0x35, 0x55, 0xaa, 0x63, 0xda, 0xbf, 0x1a, 0x40, 0x28, 0xf2, 0x05, 0x4b, 0x38, 0xfe, 0xff,
-	0x87, 0xfe, 0xe0, 0x79, 0xaf, 0x6a, 0xda, 0xaf, 0xaf, 0xed, 0xf5, 0x66, 0x37, 0xab, 0x66, 0x7b,
-	0xc1, 0xf7, 0xd7, 0x2d, 0xe3, 0x87, 0xeb, 0x96, 0xf1, 0xf3, 0x75, 0xcb, 0xf8, 0xea, 0x97, 0xd6,
-	0xc6, 0xe7, 0xef, 0xcf, 0xe2, 0xec, 0xfc, 0x32, 0x70, 0x42, 0x76, 0xd1, 0x49, 0xf8, 0x22, 0x0c,
-	0x0f, 0x22, 0xcc, 0x3b, 0x09, 0xb2, 0x29, 0x3f, 0xf0, 0x17, 0xf1, 0xc1, 0x8c, 0x75, 0x6e, 0xfc,
-	0xf9, 0x3e, 0xd4, 0xce, 0x37, 0xa5, 0xbd, 0x13, 0x64, 0x0f, 0x47, 0x4e, 0xf7, 0x74, 0x28, 0xca,
-	0x8f, 0x14, 0x1c, 0x6c, 0xc9, 0x5f, 0xe2, 0xdb, 0xbf, 0x07, 0x00, 0x00, 0xff, 0xff, 0xb8, 0xaf,
-	0x1e, 0xa2, 0x94, 0x07, 0x00, 0x00,
+	0x10, 0xce, 0xd8, 0x13, 0x4f, 0x5c, 0x8e, 0xa3, 0xd9, 0x56, 0xa4, 0xb5, 0xac, 0x95, 0x37, 0x1a,
+	0x40, 0x70, 0x20, 0x63, 0xed, 0x00, 0x0a, 0x3f, 0x8b, 0x84, 0x1d, 0xcf, 0xae, 0x2d, 0x42, 0x36,
+	0x6a, 0x7b, 0x23, 0xc4, 0xc5, 0x9a, 0x9f, 0xb2, 0x33, 0x59, 0x67, 0xda, 0x4c, 0x77, 0x86, 0xf8,
+	0x05, 0xb8, 0x71, 0xe7, 0x19, 0xb8, 0x71, 0xe1, 0x19, 0x38, 0xf2, 0x08, 0x28, 0xdc, 0xb8, 0x71,
+	0xe2, 0x8a, 0xba, 0xa7, 0xbd, 0x78, 0x13, 0x07, 0x38, 0x20, 0xc4, 0xad, 0xba, 0xea, 0xab, 0xaf,
+	0x7e, 0xa7, 0x06, 0x9a, 0xb9, 0xd7, 0xe6, 0x98, 0xe5, 0x49, 0x84, 0xed, 0x69, 0x36, 0x8f, 0xda,
+	0x17, 0x28, 0x02, 0x77, 0x9e, 0x31, 0xc1, 0xc8, 0xbd, 0x14, 0x99, 0x3b, 0xe1, 0x6e, 0xee, 0xb9,
+	0x1a, 0xd2, 0xbc, 0x9f, 0x7b, 0xed, 0x20, 0x9a, 0x15, 0x50, 0xb1, 0x98, 0x23, 0x2f, 0xb0, 0xcd,
+	0x46, 0xee, 0xb5, 0x33, 0x9c, 0xf0, 0xdb, 0x96, 0x07, 0x37, 0x23, 0xe4, 0x98, 0x25, 0x93, 0x45,
+	0x61, 0x75, 0x1e, 0x81, 0xf5, 0x79, 0x1f, 0x83, 0x18, 0x33, 0x62, 0x43, 0xf9, 0x05, 0x2e, 0x1a,
+	0xc6, 0x9e, 0xf1, 0x56, 0x95, 0x4a, 0x91, 0xec, 0xc2, 0x66, 0x1e, 0xcc, 0x2e, 0xb1, 0x51, 0x52,
+	0xba, 0xe2, 0xe1, 0xbc, 0x07, 0xd6, 0x29, 0x66, 0x3c, 0x61, 0xa9, 0x04, 0x5c, 0x04, 0xe7, 0x2c,
+	0x53, 0x4e, 0x75, 0x5a, 0x3c, 0x94, 0x36, 0x49, 0x59, 0xa6, 0xdc, 0xa4, 0x56, 0x3e, 0x1c, 0x1f,
+	0xea, 0x23, 0xf6, 0x02, 0xd3, 0xa3, 0x64, 0x82, 0x22, 0xb9, 0x40, 0x19, 0x0f, 0xaf, 0xe6, 0xca,
+	0xd5, 0xa4, 0x52, 0x94, 0x9a, 0x34, 0x9c, 0x28, 0x37, 0x93, 0x4a, 0x51, 0x6a, 0x92, 0x40, 0x34,
+	0xca, 0x85, 0x26, 0x09, 0x84, 0xf3, 0xbb, 0x01, 0xbb, 0xcf, 0xc2, 0x73, 0x8c, 0xc4, 0xb0, 0x28,
+	0xea, 0x90, 0xa5, 0x02, 0xaf, 0x04, 0xf9, 0x04, 0xcc, 0x1c, 0xb3, 0x50, 0xf1, 0xed, 0x78, 0x6f,
+	0xbb, 0xb7, 0x9a, 0xe7, 0xae, 0x73, 0x73, 0x4f, 0x31, 0x0b, 0xa9, 0xf2, 0x24, 0x8f, 0xc0, 0x0a,
+	0xe2, 0x38, 0x43, 0xce, 0x55, 0x0a, 0x35, 0xef, 0xfe, 0x0a, 0x89, 0x6c, 0xae, 0xdb, 0x29, 0xcc,
+	0x74, 0x89, 0x73, 0xce, 0xc1, 0x94, 0x04, 0x64, 0x17, 0xec, 0x53, 0x9f, 0x76, 0xc7, 0xcf, 0x8f,
+	0x87, 0x27, 0xfe, 0xe1, 0xe0, 0xc9, 0xc0, 0xef, 0xd9, 0x1b, 0xc4, 0x82, 0xf2, 0xc9, 0xf3, 0x91,
+	0x6d, 0x48, 0xe1, 0xa9, 0x3f, 0xb2, 0x4b, 0x64, 0x0b, 0xcc, 0xbe, 0xdf, 0xe9, 0xd9, 0x65, 0x02,
+	0x50, 0x19, 0xfa, 0x1d, 0x7a, 0xd8, 0xb7, 0x4d, 0x29, 0xf7, 0xfc, 0x23, 0x7f, 0xe4, 0xdb, 0x9b,
+	0xa4, 0x0a, 0x9b, 0xb4, 0x73, 0xfc, 0xd4, 0xb7, 0x2b, 0xa4, 0x0e, 0x55, 0x25, 0xf6, 0x3b, 0xc3,
+	0xbe, 0x6d, 0x39, 0xdf, 0x94, 0x61, 0x7b, 0x88, 0x5c, 0x36, 0x5e, 0x35, 0x92, 0xbc, 0x0f, 0x66,
+	0xc8, 0xe2, 0x62, 0x62, 0x35, 0xef, 0xf5, 0x35, 0x15, 0xaf, 0xc2, 0xdd, 0x2e, 0x8b, 0x17, 0x54,
+	0x79, 0x90, 0x0f, 0xa1, 0xca, 0x93, 0x69, 0x1a, 0x88, 0xcb, 0x0c, 0x75, 0xad, 0x0f, 0xd6, 0xb9,
+	0x2f, 0x31, 0xf4, 0x4f, 0x78, 0xf3, 0xeb, 0x12, 0x98, 0x92, 0x8a, 0xec, 0x40, 0x29, 0x89, 0x55,
+	0xf0, 0x6d, 0x5a, 0x4a, 0x62, 0xe2, 0xc1, 0x16, 0xfb, 0x2a, 0xc5, 0x6c, 0x9c, 0xc4, 0x77, 0xf5,
+	0xef, 0x99, 0xb4, 0x0f, 0x7a, 0xd4, 0x52, 0xc0, 0x41, 0x4c, 0x1e, 0xc3, 0xd6, 0x4c, 0xef, 0x83,
+	0x1a, 0x72, 0xcd, 0xdb, 0x5b, 0x93, 0xc7, 0x2b, 0x7b, 0x43, 0x5f, 0x7a, 0x90, 0x87, 0x50, 0xe3,
+	0x45, 0x85, 0x63, 0xb9, 0xb9, 0xa6, 0x4a, 0x05, 0xb4, 0xea, 0x53, 0x5c, 0x90, 0x13, 0xd8, 0x61,
+	0x6a, 0xe8, 0x63, 0x4d, 0xd5, 0xd8, 0x54, 0x41, 0xde, 0xfc, 0x87, 0xdb, 0xd1, 0xdf, 0xa0, 0x75,
+	0xb6, 0xaa, 0xef, 0x56, 0xc1, 0x8a, 0x0a, 0x9b, 0xf3, 0x43, 0x09, 0x6a, 0x5d, 0x0c, 0x32, 0xcc,
+	0x8a, 0x71, 0x1c, 0xbc, 0x32, 0x8e, 0xd7, 0xd6, 0x84, 0x58, 0x41, 0xff, 0x5b, 0xd3, 0xf8, 0xde,
+	0xd0, 0xd3, 0x38, 0x00, 0xc0, 0x20, 0x9a, 0x8d, 0x45, 0x10, 0xce, 0x50, 0xe7, 0xd0, 0x58, 0x61,
+	0x09, 0xa2, 0x99, 0xeb, 0x77, 0x0e, 0x8f, 0x46, 0xd2, 0x4e, 0xab, 0x12, 0xab, 0xc4, 0xff, 0x7e,
+	0x6c, 0xce, 0x6f, 0x25, 0xb8, 0x47, 0xf1, 0xcb, 0x4b, 0xe4, 0xe2, 0x33, 0x14, 0x81, 0x3e, 0x3f,
+	0xef, 0x82, 0x95, 0x17, 0x67, 0x45, 0x67, 0xdf, 0x5c, 0x43, 0xa9, 0x0f, 0x0f, 0x5d, 0x42, 0xe5,
+	0xad, 0xc1, 0x39, 0x8b, 0xce, 0xf4, 0xd1, 0x28, 0x1e, 0xf2, 0x6c, 0x08, 0x31, 0x53, 0xa9, 0xd5,
+	0xa9, 0x14, 0xc9, 0x01, 0x54, 0xaf, 0xc6, 0x67, 0x2a, 0x12, 0x6f, 0x98, 0x7b, 0xe5, 0x3b, 0xf8,
+	0xf5, 0x2d, 0xa4, 0x5b, 0x57, 0x85, 0xc0, 0x49, 0x0f, 0xea, 0xcb, 0x1d, 0x13, 0xb2, 0x1e, 0xbd,
+	0x41, 0x0f, 0xff, 0xe6, 0x6b, 0xa3, 0xdb, 0x7c, 0xf5, 0x53, 0xed, 0xc0, 0x76, 0xa8, 0x86, 0xaf,
+	0x49, 0x2a, 0x8a, 0xa4, 0xf5, 0xd7, 0x3b, 0x42, 0x6b, 0xe1, 0xca, 0x7a, 0x3d, 0x86, 0x0a, 0xcb,
+	0x92, 0x69, 0x92, 0x36, 0xac, 0x3b, 0xbf, 0xf7, 0x5b, 0x5d, 0xa5, 0xda, 0xc7, 0xf9, 0xd5, 0x00,
+	0x42, 0x91, 0xcf, 0x59, 0xca, 0xf1, 0xff, 0xdf, 0xf4, 0x8f, 0x5f, 0xd6, 0x5a, 0x74, 0xfb, 0x8d,
+	0xb5, 0xb5, 0xde, 0xac, 0x66, 0x59, 0x6c, 0x37, 0xfc, 0xf1, 0xba, 0x65, 0xfc, 0x74, 0xdd, 0x32,
+	0x7e, 0xbe, 0x6e, 0x19, 0xdf, 0xfe, 0xd2, 0xda, 0xf8, 0xe2, 0x83, 0x69, 0x22, 0xce, 0x2e, 0x43,
+	0x37, 0x62, 0x17, 0xed, 0x94, 0xcf, 0xa3, 0x68, 0x3f, 0xc6, 0xbc, 0x9d, 0x22, 0x9b, 0xf0, 0xfd,
+	0x60, 0x9e, 0xec, 0x4f, 0x59, 0xfb, 0xc6, 0x6f, 0xf2, 0x23, 0xfd, 0xf8, 0xae, 0xb4, 0x7b, 0x8c,
+	0xec, 0xc9, 0xd0, 0xed, 0x9c, 0x0c, 0x64, 0x78, 0x7d, 0x08, 0xc2, 0x8a, 0xfa, 0x7f, 0xbe, 0xf3,
+	0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0x08, 0x43, 0x06, 0xc6, 0xc1, 0x07, 0x00, 0x00,
 }
 
 func (m *XHeader) Marshal() (dAtA []byte, err error) {
@@ -945,6 +995,50 @@ func (m *TokenLifetime) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
+func (m *ObjectServiceContext) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *ObjectServiceContext) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *ObjectServiceContext) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.XXX_unrecognized != nil {
+		i -= len(m.XXX_unrecognized)
+		copy(dAtA[i:], m.XXX_unrecognized)
+	}
+	if m.Address != nil {
+		{
+			size, err := m.Address.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintMeta(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x12
+	}
+	if m.Verb != 0 {
+		i = encodeVarintMeta(dAtA, i, uint64(m.Verb))
+		i--
+		dAtA[i] = 0x8
+	}
+	return len(dAtA) - i, nil
+}
+
 func (m *SessionToken) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -1034,7 +1128,7 @@ func (m *SessionToken_Body) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		copy(dAtA[i:], m.SessionKey)
 		i = encodeVarintMeta(dAtA, i, uint64(len(m.SessionKey)))
 		i--
-		dAtA[i] = 0x2a
+		dAtA[i] = 0x22
 	}
 	if m.Lifetime != nil {
 		{
@@ -1046,12 +1140,7 @@ func (m *SessionToken_Body) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintMeta(dAtA, i, uint64(size))
 		}
 		i--
-		dAtA[i] = 0x22
-	}
-	if m.Verb != 0 {
-		i = encodeVarintMeta(dAtA, i, uint64(m.Verb))
-		i--
-		dAtA[i] = 0x18
+		dAtA[i] = 0x1a
 	}
 	if m.OwnerId != nil {
 		{
@@ -1075,16 +1164,16 @@ func (m *SessionToken_Body) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
-func (m *SessionToken_Body_ObjectAddress) MarshalTo(dAtA []byte) (int, error) {
+func (m *SessionToken_Body_ObjectService) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *SessionToken_Body_ObjectAddress) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *SessionToken_Body_ObjectService) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
-	if m.ObjectAddress != nil {
+	if m.ObjectService != nil {
 		{
-			size, err := m.ObjectAddress.MarshalToSizedBuffer(dAtA[:i])
+			size, err := m.ObjectService.MarshalToSizedBuffer(dAtA[:i])
 			if err != nil {
 				return 0, err
 			}
@@ -1092,7 +1181,7 @@ func (m *SessionToken_Body_ObjectAddress) MarshalToSizedBuffer(dAtA []byte) (int
 			i = encodeVarintMeta(dAtA, i, uint64(size))
 		}
 		i--
-		dAtA[i] = 0x32
+		dAtA[i] = 0x2a
 	}
 	return len(dAtA) - i, nil
 }
@@ -1454,6 +1543,25 @@ func (m *TokenLifetime) Size() (n int) {
 	return n
 }
 
+func (m *ObjectServiceContext) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.Verb != 0 {
+		n += 1 + sovMeta(uint64(m.Verb))
+	}
+	if m.Address != nil {
+		l = m.Address.Size()
+		n += 1 + l + sovMeta(uint64(l))
+	}
+	if m.XXX_unrecognized != nil {
+		n += len(m.XXX_unrecognized)
+	}
+	return n
+}
+
 func (m *SessionToken) Size() (n int) {
 	if m == nil {
 		return 0
@@ -1488,9 +1596,6 @@ func (m *SessionToken_Body) Size() (n int) {
 		l = m.OwnerId.Size()
 		n += 1 + l + sovMeta(uint64(l))
 	}
-	if m.Verb != 0 {
-		n += 1 + sovMeta(uint64(m.Verb))
-	}
 	if m.Lifetime != nil {
 		l = m.Lifetime.Size()
 		n += 1 + l + sovMeta(uint64(l))
@@ -1508,14 +1613,14 @@ func (m *SessionToken_Body) Size() (n int) {
 	return n
 }
 
-func (m *SessionToken_Body_ObjectAddress) Size() (n int) {
+func (m *SessionToken_Body_ObjectService) Size() (n int) {
 	if m == nil {
 		return 0
 	}
 	var l int
 	_ = l
-	if m.ObjectAddress != nil {
-		l = m.ObjectAddress.Size()
+	if m.ObjectService != nil {
+		l = m.ObjectService.Size()
 		n += 1 + l + sovMeta(uint64(l))
 	}
 	return n
@@ -1963,6 +2068,115 @@ func (m *TokenLifetime) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *ObjectServiceContext) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowMeta
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: ObjectServiceContext: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: ObjectServiceContext: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Verb", wireType)
+			}
+			m.Verb = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowMeta
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Verb |= ObjectServiceContext_Verb(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowMeta
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthMeta
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthMeta
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Address == nil {
+				m.Address = &grpc.Address{}
+			}
+			if err := m.Address.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipMeta(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if skippy < 0 {
+				return ErrInvalidLengthMeta
+			}
+			if (iNdEx + skippy) < 0 {
+				return ErrInvalidLengthMeta
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func (m *SessionToken) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
@@ -2189,25 +2403,6 @@ func (m *SessionToken_Body) Unmarshal(dAtA []byte) error {
 			}
 			iNdEx = postIndex
 		case 3:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Verb", wireType)
-			}
-			m.Verb = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowMeta
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.Verb |= SessionToken_Body_Verb(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		case 4:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Lifetime", wireType)
 			}
@@ -2243,7 +2438,7 @@ func (m *SessionToken_Body) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 5:
+		case 4:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field SessionKey", wireType)
 			}
@@ -2277,9 +2472,9 @@ func (m *SessionToken_Body) Unmarshal(dAtA []byte) error {
 				m.SessionKey = []byte{}
 			}
 			iNdEx = postIndex
-		case 6:
+		case 5:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ObjectAddress", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field ObjectService", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -2306,11 +2501,11 @@ func (m *SessionToken_Body) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			v := &grpc.Address{}
+			v := &ObjectServiceContext{}
 			if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
-			m.Context = &SessionToken_Body_ObjectAddress{v}
+			m.Context = &SessionToken_Body_ObjectService{v}
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
diff --git a/v2/service/grpc/verify.pb.go b/v2/service/grpc/verify.pb.go
index 3f270b6..4c20515 100644
--- a/v2/service/grpc/verify.pb.go
+++ b/v2/service/grpc/verify.pb.go
@@ -6,8 +6,6 @@ package service
 import (
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	_ "github.com/nspcc-dev/neofs-api-go/v2/acl/grpc"
-	_ "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -243,30 +241,28 @@ func init() {
 func init() { proto.RegisterFile("v2/service/grpc/verify.proto", fileDescriptor_333853833d6163d3) }
 
 var fileDescriptor_333853833d6163d3 = []byte{
-	// 361 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x93, 0xcf, 0x4a, 0xeb, 0x40,
-	0x14, 0xc6, 0x6f, 0xd2, 0x52, 0xb8, 0x73, 0xef, 0xed, 0xad, 0x41, 0x30, 0x96, 0x12, 0xa4, 0x2b,
-	0x17, 0x66, 0x06, 0xe3, 0x4a, 0x5c, 0x69, 0xfd, 0xbb, 0x11, 0x49, 0xc1, 0x85, 0x1b, 0x49, 0xd2,
-	0x93, 0x38, 0x68, 0x67, 0xe2, 0xcc, 0x74, 0x20, 0x6f, 0xe2, 0x33, 0xb8, 0x16, 0x9f, 0xc1, 0xa5,
-	0x8f, 0x20, 0xf5, 0x45, 0x24, 0x49, 0x6b, 0x4b, 0xff, 0x40, 0xf7, 0xee, 0x4e, 0x4e, 0xbe, 0xef,
-	0x37, 0x1f, 0x1f, 0x1c, 0xd4, 0xd2, 0x1e, 0x91, 0x20, 0x34, 0x8d, 0x80, 0x24, 0x22, 0x8d, 0x88,
-	0x06, 0x41, 0xe3, 0x0c, 0xa7, 0x82, 0x2b, 0x6e, 0xad, 0x31, 0xe0, 0x38, 0x96, 0x58, 0x7b, 0x78,
-	0x24, 0x6a, 0x6e, 0x68, 0x8f, 0x04, 0xd1, 0x43, 0x29, 0x56, 0x59, 0x0a, 0xb2, 0xd4, 0x36, 0x6d,
-	0xed, 0x11, 0x01, 0xb1, 0x9c, 0xfb, 0xd3, 0xde, 0x45, 0xbf, 0xbb, 0x34, 0x61, 0x81, 0x1a, 0x08,
-	0xb0, 0x1a, 0xa8, 0x72, 0x0f, 0x99, 0x6d, 0x6c, 0x19, 0xdb, 0x7f, 0xfd, 0x7c, 0xb4, 0x2c, 0x54,
-	0x95, 0x34, 0x61, 0xb6, 0x59, 0xac, 0x8a, 0xb9, 0xfd, 0x62, 0xa2, 0x4d, 0x1f, 0x1e, 0x07, 0x20,
-	0xd5, 0x75, 0x1e, 0x88, 0x46, 0x81, 0xa2, 0x9c, 0x9d, 0x43, 0xd0, 0x03, 0x61, 0x75, 0x50, 0x3d,
-	0xe4, 0xbd, 0xec, 0x56, 0x8e, 0xa9, 0x05, 0xee, 0x8f, 0xd7, 0xc2, 0x73, 0x79, 0xf1, 0xf7, 0xcb,
-	0xfe, 0xbf, 0xdc, 0x33, 0x09, 0xd2, 0x41, 0xf5, 0x3e, 0xa8, 0x60, 0x0a, 0x62, 0xae, 0x02, 0xc9,
-	0x3d, 0x13, 0xc8, 0x19, 0x6a, 0x70, 0x41, 0x13, 0xca, 0xa6, 0x30, 0x95, 0x15, 0x30, 0xff, 0x4b,
-	0xd7, 0x04, 0x74, 0x8c, 0x6a, 0xe5, 0xca, 0xae, 0x16, 0xf6, 0x9d, 0x05, 0xf6, 0xa5, 0x85, 0xf8,
-	0x23, 0x6f, 0xfb, 0xd5, 0x44, 0x4d, 0x1f, 0x64, 0xca, 0x99, 0x84, 0x9f, 0xd1, 0xdb, 0xc9, 0x4c,
-	0x6f, 0xee, 0xc2, 0xde, 0x96, 0x35, 0x32, 0x2e, 0xee, 0x28, 0x7c, 0x1b, 0x3a, 0xc6, 0xfb, 0xd0,
-	0x31, 0x3e, 0x86, 0x8e, 0xf1, 0xf4, 0xe9, 0xfc, 0xba, 0xd9, 0x4f, 0xa8, 0xba, 0x1b, 0x84, 0x38,
-	0xe2, 0x7d, 0xc2, 0x64, 0x1a, 0x45, 0x6e, 0x0f, 0x34, 0x61, 0xc0, 0x63, 0xe9, 0x06, 0x29, 0x75,
-	0x13, 0x4e, 0x66, 0x4e, 0xe7, 0x60, 0xf4, 0xf1, 0x6c, 0xae, 0x5f, 0x02, 0x3f, 0xed, 0xe2, 0xc3,
-	0xab, 0x8b, 0x3c, 0x46, 0xb7, 0x5c, 0x87, 0xb5, 0xe2, 0x1a, 0xf6, 0xbe, 0x02, 0x00, 0x00, 0xff,
-	0xff, 0x66, 0xc2, 0xc4, 0xb8, 0x73, 0x03, 0x00, 0x00,
+	// 335 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x29, 0x33, 0xd2, 0x2f,
+	0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x4f, 0x2f, 0x2a, 0x48, 0xd6, 0x2f, 0x4b, 0x2d, 0xca,
+	0x4c, 0xab, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xcc, 0x4b, 0xcd, 0xd7, 0x4b, 0x2b,
+	0xd6, 0x2b, 0x33, 0xd2, 0x83, 0x2a, 0x52, 0x32, 0xe4, 0xe2, 0x0c, 0xce, 0x4c, 0xcf, 0x4b, 0x2c,
+	0x29, 0x2d, 0x4a, 0x15, 0x12, 0xe0, 0x62, 0xce, 0x4e, 0xad, 0x94, 0x60, 0x54, 0x60, 0xd4, 0xe0,
+	0x09, 0x02, 0x31, 0x85, 0x84, 0xb8, 0x58, 0x8a, 0x33, 0xd3, 0xf3, 0x24, 0x98, 0xc0, 0x42, 0x60,
+	0xb6, 0xd2, 0x16, 0x26, 0x2e, 0xc9, 0xa0, 0xd4, 0xc2, 0xd2, 0xd4, 0xe2, 0x92, 0x30, 0x90, 0xe9,
+	0x99, 0xc9, 0x89, 0x25, 0x99, 0xf9, 0x79, 0x1e, 0xa9, 0x89, 0x29, 0xa9, 0x45, 0x42, 0xce, 0x5c,
+	0x7c, 0x49, 0xf9, 0x29, 0x95, 0xf1, 0xc5, 0x30, 0x53, 0xc1, 0xc6, 0x71, 0x1b, 0xc9, 0xe8, 0x61,
+	0x58, 0xae, 0x07, 0xb7, 0x39, 0x88, 0x17, 0xa4, 0x07, 0xe1, 0x10, 0x67, 0x2e, 0xbe, 0xdc, 0xd4,
+	0x92, 0x44, 0x24, 0x43, 0x98, 0x88, 0x31, 0x04, 0xa4, 0x07, 0x61, 0x88, 0x3b, 0x97, 0x40, 0x7e,
+	0x51, 0x66, 0x7a, 0x66, 0x1e, 0x92, 0x31, 0xcc, 0x44, 0x18, 0xc3, 0x0f, 0xd1, 0x85, 0x30, 0xc8,
+	0x85, 0x8b, 0x0d, 0x22, 0x24, 0xc1, 0x02, 0xd6, 0xae, 0x83, 0x45, 0x3b, 0xce, 0x00, 0x09, 0x82,
+	0xea, 0x55, 0xda, 0xc6, 0xc4, 0x25, 0x15, 0x94, 0x5a, 0x5c, 0x90, 0x9f, 0x57, 0x9c, 0x3a, 0x32,
+	0xc2, 0xcd, 0x15, 0x2d, 0xdc, 0x74, 0xb1, 0x86, 0x1b, 0xae, 0x10, 0x81, 0x05, 0x9c, 0x53, 0xd2,
+	0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe3, 0xb1, 0x1c,
+	0x43, 0x94, 0x65, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x5e, 0x71,
+	0x41, 0x72, 0xb2, 0x6e, 0x4a, 0x6a, 0x99, 0x7e, 0x5e, 0x6a, 0x7e, 0x5a, 0xb1, 0x6e, 0x62, 0x41,
+	0xa6, 0x6e, 0x7a, 0xbe, 0x3e, 0x5a, 0x3e, 0xb0, 0x86, 0x72, 0x56, 0x31, 0x89, 0xf8, 0xa5, 0xe6,
+	0xbb, 0x05, 0xeb, 0x39, 0x06, 0x78, 0x82, 0x9c, 0x11, 0x0c, 0x11, 0x4e, 0x62, 0x03, 0x67, 0x10,
+	0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdc, 0xd7, 0x4d, 0x30, 0x40, 0x03, 0x00, 0x00,
 }
 
 func (m *Signature) Marshal() (dAtA []byte, err error) {