diff --git a/protos/guard/guard.pb.go b/protos/guard/guard.pb.go
index cdc47df..cce6abf 100644
--- a/protos/guard/guard.pb.go
+++ b/protos/guard/guard.pb.go
@@ -6,7 +6,7 @@ package guard
 import (
 	context "context"
 	fmt "fmt"
-	types "github.com/gogo/protobuf/types"
+	_ "github.com/gogo/protobuf/types"
 	golang_proto "github.com/golang/protobuf/proto"
 	_ "github.com/tron-us/protobuf/gogoproto"
 	proto "github.com/tron-us/protobuf/proto"
@@ -204,12 +204,12 @@ func (FileStoreStatus_RentalState) EnumDescriptor() ([]byte, []int) {
 }
 
 type Log struct {
-	ChangeTime           *types.Timestamp `protobuf:"bytes,1,opt,name=change_time,json=changeTime,proto3" json:"change_time,omitempty" pg:"change_time"`
-	OriginatorPid        string           `protobuf:"bytes,2,opt,name=originator_pid,json=originatorPid,proto3" json:"originator_pid,omitempty" pg:"originator_pid"`
-	Change               string           `protobuf:"bytes,3,opt,name=change,proto3" json:"change,omitempty" pg:"change"`
-	XXX_NoUnkeyedLiteral struct{}         `json:"-" pg:"-"`
-	XXX_unrecognized     []byte           `json:"-" pg:"-"`
-	XXX_sizecache        int32            `json:"-" pg:"-"`
+	ChangeTime           time.Time `protobuf:"bytes,1,opt,name=change_time,json=changeTime,proto3,stdtime" json:"change_time" pg:"change_time"`
+	OriginatorPid        string    `protobuf:"bytes,2,opt,name=originator_pid,json=originatorPid,proto3" json:"originator_pid,omitempty" pg:"originator_pid"`
+	Change               string    `protobuf:"bytes,3,opt,name=change,proto3" json:"change,omitempty" pg:"change"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-" pg:"-"`
+	XXX_unrecognized     []byte    `json:"-" pg:"-"`
+	XXX_sizecache        int32     `json:"-" pg:"-"`
 }
 
 func (m *Log) Reset()         { *m = Log{} }
@@ -245,11 +245,11 @@ func (m *Log) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_Log proto.InternalMessageInfo
 
-func (m *Log) GetChangeTime() *types.Timestamp {
+func (m *Log) GetChangeTime() time.Time {
 	if m != nil {
 		return m.ChangeTime
 	}
-	return nil
+	return time.Time{}
 }
 
 func (m *Log) GetOriginatorPid() string {
@@ -450,7 +450,7 @@ func (*ContractMeta) XXX_MessageName() string {
 
 type Contract struct {
 	//the contract executor record, changed frequently after proposal
-	Contract             *ContractMeta          `protobuf:"bytes,1,opt,name=contract,proto3" json:"contract,omitempty" pg:"contract"`
+	ContractMeta         `protobuf:"bytes,1,opt,name=contract,proto3,embedded=contract" json:"contract" pg:"contract"`
 	State                Contract_ContractState `protobuf:"varint,2,opt,name=state,proto3,enum=guard.Contract_ContractState" json:"state,omitempty" pg:"state"`
 	RenterSignature      []byte                 `protobuf:"bytes,3,opt,name=renter_signature,json=renterSignature,proto3" json:"renter_signature,omitempty" pg:"renter_signature"`
 	HostSignature        []byte                 `protobuf:"bytes,4,opt,name=host_signature,json=hostSignature,proto3" json:"host_signature,omitempty" pg:"host_signature"`
@@ -499,13 +499,6 @@ func (m *Contract) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_Contract proto.InternalMessageInfo
 
-func (m *Contract) GetContract() *ContractMeta {
-	if m != nil {
-		return m.Contract
-	}
-	return nil
-}
-
 func (m *Contract) GetState() Contract_ContractState {
 	if m != nil {
 		return m.State
@@ -729,9 +722,9 @@ func (*FileStoreMeta) XXX_MessageName() string {
 }
 
 type FileStoreStatus struct {
-	FileStoreMeta        *FileStoreMeta              `protobuf:"bytes,1,opt,name=file_store_meta,json=fileStoreMeta,proto3" json:"file_store_meta,omitempty" pg:"file_store_meta"`
+	FileStoreMeta        `protobuf:"bytes,1,opt,name=file_store_meta,json=fileStoreMeta,proto3,embedded=file_store_meta" json:"file_store_meta" pg:"file_store_meta"`
 	State                FileStoreStatus_MetaState   `protobuf:"varint,2,opt,name=state,proto3,enum=guard.FileStoreStatus_MetaState" json:"state,omitempty" pg:"state"`
-	Contracts            []*Contract                 `protobuf:"bytes,3,rep,name=contracts,proto3" json:"contracts,omitempty" pg:"contracts"`
+	Contracts            []Contract                  `protobuf:"bytes,3,rep,name=contracts,proto3" json:"contracts" pg:"contracts"`
 	RenterSignature      []byte                      `protobuf:"bytes,4,opt,name=renter_signature,json=renterSignature,proto3" json:"renter_signature,omitempty" pg:"renter_signature"`
 	GuardReceiveTime     time.Time                   `protobuf:"bytes,5,opt,name=guard_receive_time,json=guardReceiveTime,proto3,stdtime" json:"guard_receive_time" pg:"guard_receive_time"`
 	ChangeLog            []*Log                      `protobuf:"bytes,6,rep,name=change_log,json=changeLog,proto3" json:"change_log,omitempty" pg:"change_log"`
@@ -778,13 +771,6 @@ func (m *FileStoreStatus) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_FileStoreStatus proto.InternalMessageInfo
 
-func (m *FileStoreStatus) GetFileStoreMeta() *FileStoreMeta {
-	if m != nil {
-		return m.FileStoreMeta
-	}
-	return nil
-}
-
 func (m *FileStoreStatus) GetState() FileStoreStatus_MetaState {
 	if m != nil {
 		return m.State
@@ -792,7 +778,7 @@ func (m *FileStoreStatus) GetState() FileStoreStatus_MetaState {
 	return FileStoreStatus_DRAFT
 }
 
-func (m *FileStoreStatus) GetContracts() []*Contract {
+func (m *FileStoreStatus) GetContracts() []Contract {
 	if m != nil {
 		return m.Contracts
 	}
@@ -943,16 +929,16 @@ func (*ChallengeQuestion) XXX_MessageName() string {
 }
 
 type ProofOfReplicateChallenge struct {
-	Question             *ChallengeQuestion `protobuf:"bytes,1,opt,name=question,proto3" json:"question,omitempty" pg:"question"`
-	ChallengeTime        time.Time          `protobuf:"bytes,2,opt,name=challenge_time,json=challengeTime,proto3,stdtime" json:"challenge_time" pg:"challenge_time"`
-	GuardPid             string             `protobuf:"bytes,3,opt,name=guard_pid,json=guardPid,proto3" json:"guard_pid,omitempty" pg:"guard_pid"`
-	GuardSignature       []byte             `protobuf:"bytes,4,opt,name=guard_signature,json=guardSignature,proto3" json:"guard_signature,omitempty" pg:"guard_signature"`
-	HostAnswer           string             `protobuf:"bytes,5,opt,name=host_answer,json=hostAnswer,proto3" json:"host_answer,omitempty" pg:"host_answer"`
-	HostSignTime         time.Time          `protobuf:"bytes,6,opt,name=host_sign_time,json=hostSignTime,proto3,stdtime" json:"host_sign_time" pg:"host_sign_time"`
-	HostSignature        []byte             `protobuf:"bytes,7,opt,name=host_signature,json=hostSignature,proto3" json:"host_signature,omitempty" pg:"host_signature"`
-	XXX_NoUnkeyedLiteral struct{}           `json:"-" pg:"-"`
-	XXX_unrecognized     []byte             `json:"-" pg:"-"`
-	XXX_sizecache        int32              `json:"-" pg:"-"`
+	ChallengeQuestion    `protobuf:"bytes,1,opt,name=question,proto3,embedded=question" json:"question" pg:"question"`
+	ChallengeTime        time.Time `protobuf:"bytes,2,opt,name=challenge_time,json=challengeTime,proto3,stdtime" json:"challenge_time" pg:"challenge_time"`
+	GuardPid             string    `protobuf:"bytes,3,opt,name=guard_pid,json=guardPid,proto3" json:"guard_pid,omitempty" pg:"guard_pid"`
+	GuardSignature       []byte    `protobuf:"bytes,4,opt,name=guard_signature,json=guardSignature,proto3" json:"guard_signature,omitempty" pg:"guard_signature"`
+	HostAnswer           string    `protobuf:"bytes,5,opt,name=host_answer,json=hostAnswer,proto3" json:"host_answer,omitempty" pg:"host_answer"`
+	HostSignTime         time.Time `protobuf:"bytes,6,opt,name=host_sign_time,json=hostSignTime,proto3,stdtime" json:"host_sign_time" pg:"host_sign_time"`
+	HostSignature        []byte    `protobuf:"bytes,7,opt,name=host_signature,json=hostSignature,proto3" json:"host_signature,omitempty" pg:"host_signature"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-" pg:"-"`
+	XXX_unrecognized     []byte    `json:"-" pg:"-"`
+	XXX_sizecache        int32     `json:"-" pg:"-"`
 }
 
 func (m *ProofOfReplicateChallenge) Reset()         { *m = ProofOfReplicateChallenge{} }
@@ -988,13 +974,6 @@ func (m *ProofOfReplicateChallenge) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ProofOfReplicateChallenge proto.InternalMessageInfo
 
-func (m *ProofOfReplicateChallenge) GetQuestion() *ChallengeQuestion {
-	if m != nil {
-		return m.Question
-	}
-	return nil
-}
-
 func (m *ProofOfReplicateChallenge) GetChallengeTime() time.Time {
 	if m != nil {
 		return m.ChallengeTime
@@ -1042,11 +1021,11 @@ func (*ProofOfReplicateChallenge) XXX_MessageName() string {
 }
 
 type FileChallengeQuestions struct {
-	FileHash             string                     `protobuf:"bytes,1,opt,name=file_hash,json=fileHash,proto3" json:"file_hash,omitempty" pg:"file_hash"`
-	ShardQuestions       []*ShardChallengeQuestions `protobuf:"bytes,2,rep,name=shard_questions,json=shardQuestions,proto3" json:"shard_questions,omitempty" pg:"shard_questions"`
-	XXX_NoUnkeyedLiteral struct{}                   `json:"-" pg:"-"`
-	XXX_unrecognized     []byte                     `json:"-" pg:"-"`
-	XXX_sizecache        int32                      `json:"-" pg:"-"`
+	FileHash             string                    `protobuf:"bytes,1,opt,name=file_hash,json=fileHash,proto3" json:"file_hash,omitempty" pg:"file_hash"`
+	ShardQuestions       []ShardChallengeQuestions `protobuf:"bytes,2,rep,name=shard_questions,json=shardQuestions,proto3" json:"shard_questions" pg:"shard_questions"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-" pg:"-"`
+	XXX_unrecognized     []byte                    `json:"-" pg:"-"`
+	XXX_sizecache        int32                     `json:"-" pg:"-"`
 }
 
 func (m *FileChallengeQuestions) Reset()         { *m = FileChallengeQuestions{} }
@@ -1089,7 +1068,7 @@ func (m *FileChallengeQuestions) GetFileHash() string {
 	return ""
 }
 
-func (m *FileChallengeQuestions) GetShardQuestions() []*ShardChallengeQuestions {
+func (m *FileChallengeQuestions) GetShardQuestions() []ShardChallengeQuestions {
 	if m != nil {
 		return m.ShardQuestions
 	}
@@ -1101,16 +1080,16 @@ func (*FileChallengeQuestions) XXX_MessageName() string {
 }
 
 type ShardChallengeQuestions struct {
-	FileHash             string               `protobuf:"bytes,1,opt,name=file_hash,json=fileHash,proto3" json:"file_hash,omitempty" pg:"file_hash"`
-	ShardHash            string               `protobuf:"bytes,2,opt,name=shard_hash,json=shardHash,proto3" json:"shard_hash,omitempty" pg:"shard_hash"`
-	PreparerPid          string               `protobuf:"bytes,3,opt,name=preparer_pid,json=preparerPid,proto3" json:"preparer_pid,omitempty" pg:"preparer_pid"`
-	QuestionCount        int32                `protobuf:"varint,4,opt,name=question_count,json=questionCount,proto3" json:"question_count,omitempty" pg:"question_count"`
-	Questions            []*ChallengeQuestion `protobuf:"bytes,5,rep,name=questions,proto3" json:"questions,omitempty" pg:"questions"`
-	PrepareTime          time.Time            `protobuf:"bytes,6,opt,name=prepare_time,json=prepareTime,proto3,stdtime" json:"prepare_time" pg:"prepare_time"`
-	PreparerSignature    []byte               `protobuf:"bytes,7,opt,name=preparer_signature,json=preparerSignature,proto3" json:"preparer_signature,omitempty" pg:"preparer_signature"`
-	XXX_NoUnkeyedLiteral struct{}             `json:"-" pg:"-"`
-	XXX_unrecognized     []byte               `json:"-" pg:"-"`
-	XXX_sizecache        int32                `json:"-" pg:"-"`
+	FileHash             string              `protobuf:"bytes,1,opt,name=file_hash,json=fileHash,proto3" json:"file_hash,omitempty" pg:"file_hash"`
+	ShardHash            string              `protobuf:"bytes,2,opt,name=shard_hash,json=shardHash,proto3" json:"shard_hash,omitempty" pg:"shard_hash"`
+	PreparerPid          string              `protobuf:"bytes,3,opt,name=preparer_pid,json=preparerPid,proto3" json:"preparer_pid,omitempty" pg:"preparer_pid"`
+	QuestionCount        int32               `protobuf:"varint,4,opt,name=question_count,json=questionCount,proto3" json:"question_count,omitempty" pg:"question_count"`
+	Questions            []ChallengeQuestion `protobuf:"bytes,5,rep,name=questions,proto3" json:"questions" pg:"questions"`
+	PrepareTime          time.Time           `protobuf:"bytes,6,opt,name=prepare_time,json=prepareTime,proto3,stdtime" json:"prepare_time" pg:"prepare_time"`
+	PreparerSignature    []byte              `protobuf:"bytes,7,opt,name=preparer_signature,json=preparerSignature,proto3" json:"preparer_signature,omitempty" pg:"preparer_signature"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-" pg:"-"`
+	XXX_unrecognized     []byte              `json:"-" pg:"-"`
+	XXX_sizecache        int32               `json:"-" pg:"-"`
 }
 
 func (m *ShardChallengeQuestions) Reset()         { *m = ShardChallengeQuestions{} }
@@ -1174,7 +1153,7 @@ func (m *ShardChallengeQuestions) GetQuestionCount() int32 {
 	return 0
 }
 
-func (m *ShardChallengeQuestions) GetQuestions() []*ChallengeQuestion {
+func (m *ShardChallengeQuestions) GetQuestions() []ChallengeQuestion {
 	if m != nil {
 		return m.Questions
 	}
@@ -1387,119 +1366,120 @@ func init() { proto.RegisterFile("protos/guard/guard.proto", fileDescriptor_ad5b
 func init() { golang_proto.RegisterFile("protos/guard/guard.proto", fileDescriptor_ad5b6eccdc9ebee8) }
 
 var fileDescriptor_ad5b6eccdc9ebee8 = []byte{
-	// 1788 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4f, 0x8f, 0xdb, 0xc6,
-	0x15, 0x5f, 0x4a, 0xa2, 0x24, 0x3e, 0xfd, 0xa3, 0x27, 0xae, 0x4b, 0x6f, 0xe3, 0xdd, 0xad, 0x02,
-	0xd7, 0xeb, 0x16, 0xd6, 0x16, 0x9b, 0x20, 0x97, 0xba, 0x08, 0x64, 0x89, 0xbb, 0xde, 0x56, 0x2b,
-	0x29, 0x43, 0x2d, 0x52, 0xf7, 0x42, 0x70, 0xa9, 0x91, 0x44, 0x44, 0x22, 0x15, 0xfe, 0x71, 0xe2,
-	0x1c, 0x0a, 0x14, 0xe8, 0x07, 0xe8, 0xa1, 0x28, 0x7a, 0xea, 0x3d, 0xdf, 0xa2, 0x47, 0xdf, 0xda,
-	0x7b, 0x81, 0xb6, 0xb0, 0xbf, 0x44, 0x8f, 0xc5, 0xbc, 0x21, 0x45, 0x51, 0xab, 0x75, 0xa0, 0x14,
-	0xb9, 0x2c, 0x34, 0xbf, 0xf7, 0xde, 0xcc, 0x9b, 0xf7, 0xe7, 0x37, 0x8f, 0x0b, 0xda, 0xd2, 0xf7,
-	0x42, 0x2f, 0x38, 0x99, 0x46, 0x96, 0x3f, 0x16, 0x7f, 0x5b, 0x08, 0x11, 0x19, 0x17, 0xfb, 0x3f,
-	0x9f, 0x3a, 0xe1, 0x2c, 0xba, 0x6e, 0xd9, 0xde, 0xe2, 0x24, 0xf4, 0x3d, 0xf7, 0x49, 0x14, 0x9c,
-	0xa0, 0xc2, 0x75, 0x34, 0x39, 0x99, 0x7a, 0x53, 0x0f, 0x17, 0xf8, 0x4b, 0x18, 0xee, 0x1f, 0x4e,
-	0x3d, 0x6f, 0x3a, 0x67, 0xa9, 0x56, 0xe8, 0x2c, 0x58, 0x10, 0x5a, 0x8b, 0xa5, 0x50, 0x68, 0xfe,
-	0x5e, 0x82, 0x7c, 0xcf, 0x9b, 0x92, 0x5f, 0x40, 0xc5, 0x9e, 0x59, 0xee, 0x94, 0x99, 0x5c, 0x43,
-	0x93, 0x8e, 0xa4, 0xe3, 0xca, 0xe9, 0x7e, 0x4b, 0x98, 0xb7, 0x12, 0xf3, 0xd6, 0x28, 0x31, 0xa7,
-	0x20, 0xd4, 0x39, 0x40, 0x1e, 0x42, 0xdd, 0xf3, 0x9d, 0xa9, 0xe3, 0x5a, 0xa1, 0xe7, 0x9b, 0x4b,
-	0x67, 0xac, 0xe5, 0x8e, 0xa4, 0x63, 0x85, 0xd6, 0x52, 0x74, 0xe8, 0x8c, 0xc9, 0x3d, 0x28, 0x0a,
-	0x23, 0x2d, 0x8f, 0xe2, 0x78, 0xd5, 0xfc, 0x46, 0x86, 0x6a, 0xc7, 0x73, 0x43, 0xdf, 0xb2, 0xc3,
-	0x4b, 0x16, 0x5a, 0xe4, 0x10, 0x2a, 0x76, 0xbc, 0x36, 0x9d, 0x31, 0x3a, 0xa3, 0x50, 0x48, 0xa0,
-	0x8b, 0x31, 0x79, 0x00, 0xe0, 0x33, 0x37, 0x64, 0xeb, 0x87, 0x29, 0x02, 0xe1, 0x07, 0xdd, 0x87,
-	0xf2, 0xcc, 0x0b, 0x42, 0x14, 0x8a, 0xa3, 0x4a, 0x7c, 0xcd, 0x45, 0x0f, 0x00, 0x82, 0x99, 0xe5,
-	0x8f, 0xcd, 0x99, 0x15, 0xcc, 0xb4, 0x82, 0xb0, 0x44, 0xe4, 0xb9, 0x15, 0xcc, 0xf8, 0xc9, 0x42,
-	0xec, 0xb8, 0x63, 0xf6, 0x95, 0x26, 0x1f, 0x49, 0xc7, 0x32, 0x15, 0x16, 0x17, 0x1c, 0x21, 0x3f,
-	0x81, 0x86, 0x50, 0x98, 0x38, 0x73, 0x66, 0x06, 0xce, 0xd7, 0x4c, 0x2b, 0x1e, 0x49, 0xc7, 0x79,
-	0x5a, 0x43, 0xf8, 0xcc, 0x99, 0x33, 0xc3, 0xf9, 0x9a, 0x91, 0x1f, 0x81, 0x82, 0x1a, 0x78, 0x4c,
-	0x09, 0x8f, 0x29, 0x73, 0x00, 0x4f, 0xe9, 0x08, 0xf7, 0xcd, 0x20, 0xb4, 0xfc, 0x50, 0x2b, 0x7f,
-	0x5b, 0xac, 0x9f, 0x95, 0x5f, 0xff, 0xeb, 0x70, 0xef, 0x8f, 0xff, 0x3e, 0x94, 0xc4, 0x25, 0x0d,
-	0x6e, 0x46, 0x3e, 0x81, 0x32, 0x6e, 0xc2, 0xdc, 0xb1, 0xa6, 0xec, 0xb0, 0x45, 0x89, 0x5b, 0xe9,
-	0xee, 0x98, 0xbb, 0x88, 0x65, 0x85, 0x61, 0x02, 0xe1, 0x22, 0x02, 0x71, 0x9c, 0x58, 0x60, 0xfb,
-	0xde, 0x97, 0x28, 0xad, 0x88, 0x38, 0x09, 0x84, 0x8b, 0xef, 0x82, 0xbc, 0xf4, 0x1d, 0x9b, 0x69,
-	0x55, 0xbc, 0xbc, 0x58, 0xf0, 0x04, 0x5b, 0x0b, 0x2f, 0x72, 0x43, 0xad, 0x86, 0x70, 0xbc, 0x22,
-	0x3f, 0x83, 0x3b, 0xb6, 0x37, 0x9f, 0x5b, 0x21, 0xf3, 0xad, 0xb9, 0x19, 0xab, 0xd4, 0x51, 0x45,
-	0x4d, 0x05, 0x6d, 0xa1, 0xac, 0x43, 0x63, 0x69, 0xbd, 0xf2, 0xa2, 0xd0, 0x0c, 0xec, 0x19, 0x1b,
-	0x47, 0x73, 0xa6, 0x35, 0x8e, 0xa4, 0xe3, 0xfa, 0xe9, 0xfb, 0x2d, 0xd1, 0x12, 0xeb, 0xa5, 0xd2,
-	0x32, 0x62, 0x1d, 0x5a, 0x17, 0x46, 0xc9, 0x9a, 0x67, 0xd2, 0x8d, 0x16, 0xa6, 0x40, 0x03, 0x4d,
-	0x15, 0x99, 0x74, 0xa3, 0xc5, 0x50, 0x20, 0xcd, 0x8f, 0xa0, 0xbc, 0x52, 0xae, 0x40, 0xe9, 0x72,
-	0xd0, 0x1f, 0x3d, 0xef, 0xbd, 0x50, 0xf7, 0x48, 0x0d, 0x94, 0x4f, 0xaf, 0xda, 0x74, 0xa4, 0xd3,
-	0xde, 0x0b, 0x55, 0x22, 0x55, 0x28, 0xb7, 0xfb, 0xfd, 0xab, 0x76, 0xaf, 0xf7, 0x42, 0xcd, 0x35,
-	0xff, 0x2a, 0x43, 0x39, 0x71, 0x80, 0x9c, 0x40, 0x39, 0x29, 0xca, 0xb8, 0x63, 0xde, 0xdb, 0xe2,
-	0x23, 0x5d, 0x29, 0x91, 0x0f, 0x41, 0x0e, 0x42, 0x2b, 0x64, 0x58, 0xb2, 0xf5, 0xd3, 0x07, 0x1b,
-	0xda, 0xab, 0x1f, 0x06, 0x57, 0xa2, 0x42, 0x97, 0x3c, 0x06, 0x35, 0x2e, 0xf6, 0xc0, 0x99, 0xba,
-	0x56, 0x18, 0xf9, 0xa2, 0x81, 0xaa, 0xb4, 0x21, 0x70, 0x23, 0x81, 0x79, 0x23, 0x62, 0xe1, 0xa7,
-	0x8a, 0x05, 0x54, 0xac, 0x71, 0x34, 0x55, 0xa3, 0x40, 0xe2, 0xe4, 0x72, 0x45, 0x36, 0x16, 0x3d,
-	0x2f, 0xef, 0x50, 0x44, 0xaa, 0xb0, 0x37, 0xd0, 0x1c, 0x39, 0xe0, 0x31, 0xa8, 0x6b, 0x7b, 0x8a,
-	0xc3, 0x8b, 0xc2, 0xcb, 0x54, 0x57, 0x1c, 0xff, 0x18, 0x62, 0xf2, 0x30, 0xe7, 0xde, 0x54, 0x2b,
-	0x1d, 0xe5, 0x8f, 0x2b, 0xa7, 0x10, 0x87, 0xa2, 0xe7, 0x4d, 0xa9, 0x22, 0xa4, 0x9c, 0x96, 0xfa,
-	0xa0, 0xce, 0xad, 0x20, 0x34, 0x17, 0xde, 0xd8, 0x99, 0xbc, 0x12, 0x7e, 0xee, 0xd2, 0x2f, 0x75,
-	0x6e, 0x7d, 0x89, 0xc6, 0xe8, 0xe5, 0x23, 0x68, 0x88, 0x9a, 0x4f, 0x9d, 0x54, 0xd0, 0xc9, 0x3a,
-	0xc2, 0xa9, 0x8f, 0x3f, 0x86, 0xea, 0xd2, 0x67, 0x4b, 0xcb, 0x8f, 0x39, 0x46, 0xf4, 0x47, 0x25,
-	0xc1, 0x78, 0x0f, 0x3c, 0x01, 0xb2, 0x52, 0x49, 0xb7, 0xab, 0xe0, 0x76, 0x77, 0x12, 0xc9, 0x6a,
-	0xc7, 0x26, 0x83, 0x5a, 0x26, 0xbd, 0x44, 0x01, 0xb9, 0x4b, 0xdb, 0x67, 0x23, 0x75, 0x8f, 0x00,
-	0x14, 0x8d, 0x8b, 0xf3, 0xbe, 0xde, 0x15, 0xf5, 0x76, 0x35, 0xec, 0x0d, 0xda, 0x5d, 0xbd, 0xab,
-	0xe6, 0x48, 0x19, 0x0a, 0xbd, 0x81, 0x31, 0x52, 0xf3, 0x1c, 0xef, 0xb4, 0xfb, 0x1d, 0xbd, 0xa7,
-	0x77, 0xd5, 0x02, 0xb7, 0xe8, 0xf4, 0x06, 0x86, 0xde, 0x55, 0x65, 0x5e, 0xbd, 0x54, 0xef, 0xeb,
-	0x9f, 0xe9, 0x5d, 0xb5, 0xd8, 0xfc, 0x43, 0x01, 0x6a, 0xc8, 0x42, 0xa1, 0xe7, 0x33, 0x64, 0xd3,
-	0x2c, 0x59, 0x4a, 0x9b, 0x64, 0x99, 0x61, 0xaa, 0xdc, 0x06, 0x53, 0x25, 0x42, 0x24, 0xba, 0x3c,
-	0x76, 0x2c, 0x0a, 0x91, 0xe3, 0xb2, 0x34, 0x56, 0xf8, 0xff, 0x69, 0x4c, 0xfe, 0x2e, 0x34, 0xf6,
-	0x08, 0x1a, 0xf6, 0x8c, 0xd9, 0x9f, 0x9b, 0x13, 0x9f, 0x7d, 0x11, 0x31, 0xd7, 0x7e, 0x85, 0x75,
-	0x27, 0xd3, 0x3a, 0xc2, 0x67, 0x09, 0x9a, 0xf2, 0xdd, 0x84, 0x31, 0xa4, 0xe4, 0x7c, 0xcc, 0x77,
-	0x67, 0x8c, 0xad, 0xf1, 0x1d, 0x97, 0x96, 0x51, 0x1a, 0xf3, 0x1d, 0x17, 0xaf, 0xde, 0x05, 0x1b,
-	0xb9, 0x4b, 0x59, 0x7b, 0x17, 0x3a, 0xc8, 0x5a, 0x0f, 0xa1, 0xbe, 0x70, 0x5c, 0x67, 0x11, 0x2d,
-	0x4c, 0x44, 0x03, 0xac, 0x18, 0x99, 0xd6, 0x62, 0xd4, 0x40, 0x90, 0x33, 0xa1, 0xcf, 0x6c, 0xef,
-	0x25, 0xf3, 0xcd, 0x70, 0xe6, 0xb3, 0x60, 0xe6, 0xcd, 0x05, 0xbb, 0xca, 0x54, 0x8d, 0x05, 0xa3,
-	0x04, 0xdf, 0xe0, 0xe0, 0xea, 0x26, 0x07, 0x67, 0xf8, 0xbb, 0x96, 0xe5, 0xef, 0xe6, 0x9f, 0x8a,
-	0xd0, 0x58, 0x95, 0x01, 0xaf, 0xb7, 0x28, 0x20, 0x4f, 0xa1, 0x21, 0x92, 0xc9, 0x31, 0x73, 0xc1,
-	0x42, 0x2b, 0x66, 0xad, 0xbb, 0x71, 0xf3, 0x65, 0xea, 0x86, 0xd6, 0x26, 0x99, 0x32, 0xfa, 0x38,
-	0xcb, 0x5d, 0x47, 0x9b, 0x36, 0xe2, 0x90, 0x16, 0xd7, 0xcd, 0xd0, 0xd7, 0x13, 0x50, 0x12, 0xfe,
-	0x0b, 0xb4, 0x3c, 0x36, 0x7b, 0x63, 0x83, 0xf7, 0x68, 0xaa, 0xb1, 0x95, 0xed, 0x0a, 0xdb, 0xd9,
-	0x8e, 0x02, 0x11, 0x01, 0xf0, 0x99, 0xcd, 0x9c, 0x97, 0xec, 0x3b, 0xd0, 0x18, 0xda, 0x53, 0x61,
-	0x1e, 0xd3, 0xd8, 0x3a, 0x37, 0x15, 0xdf, 0xc5, 0x4d, 0xe7, 0x50, 0xb5, 0x23, 0x1f, 0x8b, 0x17,
-	0x0f, 0x2e, 0xed, 0x70, 0x70, 0x25, 0xb6, 0xbc, 0x8d, 0x94, 0xca, 0x5b, 0x49, 0x49, 0x87, 0x2a,
-	0x37, 0xb2, 0xe6, 0xa6, 0xc8, 0x84, 0x82, 0x99, 0x68, 0xde, 0x92, 0x09, 0x8a, 0xaa, 0x22, 0x17,
-	0x15, 0x3f, 0x5d, 0x7c, 0x0f, 0xdc, 0x36, 0x01, 0x65, 0x95, 0xf7, 0x75, 0x5e, 0xab, 0x81, 0x22,
-	0xb8, 0xec, 0xa2, 0x7f, 0xae, 0x4a, 0x48, 0x54, 0x57, 0xfd, 0x3e, 0x5f, 0xe4, 0x88, 0x0a, 0xd5,
-	0x61, 0x9b, 0x8e, 0x2e, 0xda, 0x3d, 0x33, 0x66, 0xb8, 0x84, 0xeb, 0x0a, 0xfc, 0x57, 0x77, 0xd0,
-	0xd7, 0x55, 0x39, 0xc3, 0x7a, 0xc5, 0xe6, 0x27, 0x50, 0x59, 0xbb, 0x15, 0x29, 0x41, 0xbe, 0xaf,
-	0x7f, 0xa6, 0xee, 0x91, 0x06, 0x54, 0x92, 0xbd, 0x38, 0x80, 0x27, 0xe9, 0xbf, 0x19, 0x5e, 0x50,
-	0xe4, 0x50, 0x05, 0x64, 0xe4, 0x47, 0x35, 0xdf, 0xfc, 0x46, 0x82, 0x3b, 0x9d, 0x99, 0x35, 0x9f,
-	0x33, 0x77, 0xca, 0x3e, 0x8d, 0x58, 0x10, 0x3a, 0x9e, 0xbb, 0x31, 0x14, 0x4a, 0x9b, 0x43, 0xe1,
-	0xfa, 0x38, 0x99, 0xcb, 0x8e, 0x93, 0x7c, 0x52, 0x9d, 0x45, 0xee, 0xe7, 0xf1, 0xbc, 0x98, 0x17,
-	0xbc, 0x80, 0x90, 0x98, 0x17, 0xef, 0x82, 0xec, 0x7a, 0xae, 0xcd, 0xe2, 0x51, 0x53, 0x2c, 0xc8,
-	0x07, 0x50, 0x63, 0x5f, 0x2d, 0x99, 0x1d, 0x9a, 0x96, 0x1b, 0x7c, 0xc9, 0x7c, 0x2c, 0x5a, 0x85,
-	0x56, 0x05, 0xd8, 0x46, 0xac, 0xf9, 0xdf, 0x1c, 0xdc, 0x1f, 0xfa, 0x9e, 0x37, 0x19, 0x4c, 0x28,
-	0x5b, 0xce, 0x1d, 0xdb, 0x0a, 0xd9, 0xca, 0x77, 0xf2, 0x11, 0x94, 0xbf, 0x88, 0xfd, 0x8f, 0xbb,
-	0x58, 0x4b, 0xba, 0x6a, 0xf3, 0x7e, 0x74, 0xa5, 0x49, 0x7e, 0x0d, 0x75, 0x3b, 0x11, 0x8b, 0xaa,
-	0xcd, 0xed, 0x50, 0xb5, 0xb5, 0x95, 0x2d, 0xd6, 0x6d, 0x86, 0x80, 0xf2, 0x1b, 0x03, 0xe4, 0x96,
-	0xa2, 0x2e, 0x6c, 0x2d, 0xea, 0x43, 0xa8, 0x60, 0x74, 0x33, 0x91, 0x00, 0x0e, 0x89, 0x38, 0x90,
-	0x5f, 0xad, 0x0d, 0x35, 0xc2, 0xe7, 0xe2, 0x0e, 0x3e, 0x57, 0x93, 0xd1, 0x27, 0xf9, 0x52, 0xd9,
-	0x18, 0x90, 0x4a, 0x5b, 0x06, 0xa4, 0xe6, 0xef, 0xe0, 0x1e, 0xef, 0xa6, 0x1b, 0x91, 0x0c, 0xb2,
-	0xaf, 0xa5, 0xb4, 0xf1, 0x5a, 0x9e, 0x27, 0x1f, 0x07, 0x49, 0xbc, 0x03, 0x2d, 0x87, 0x0c, 0x72,
-	0x10, 0xa7, 0x06, 0x5f, 0x81, 0x9b, 0xbb, 0xd2, 0x3a, 0x9a, 0xad, 0xd6, 0xcd, 0xbf, 0xe7, 0xe0,
-	0x87, 0xb7, 0xe8, 0xbe, 0xdb, 0x83, 0x6c, 0x25, 0xe7, 0x36, 0x2b, 0x79, 0xb3, 0xf3, 0xf3, 0x37,
-	0x3b, 0xff, 0x21, 0xd4, 0x13, 0xef, 0xe3, 0xc7, 0xae, 0x20, 0x1e, 0xb2, 0x04, 0x15, 0xef, 0xdd,
-	0xc7, 0xa0, 0xa4, 0x97, 0x94, 0xf1, 0x92, 0xb7, 0xd7, 0x5f, 0xaa, 0xca, 0x49, 0x33, 0x3e, 0x6d,
-	0xf7, 0x54, 0x26, 0x7e, 0x62, 0x26, 0xb7, 0x33, 0x54, 0xe9, 0x36, 0x86, 0x7a, 0x2b, 0xc1, 0xfd,
-	0x0e, 0xce, 0x03, 0x99, 0x37, 0x8e, 0xa1, 0x67, 0xdf, 0x1a, 0xd3, 0x77, 0x7d, 0x6c, 0x7e, 0x00,
-	0x35, 0x5f, 0x6c, 0x93, 0x09, 0x6a, 0x75, 0x05, 0x72, 0xa5, 0x73, 0x48, 0xd6, 0xe2, 0xda, 0xbb,
-	0x0c, 0x4b, 0x95, 0xd8, 0x12, 0xaf, 0xfd, 0x3e, 0x28, 0xe9, 0x6d, 0x65, 0xbc, 0x6d, 0x0a, 0x34,
-	0xff, 0x2c, 0x41, 0x91, 0xb2, 0x20, 0x9a, 0x87, 0xe4, 0x11, 0x14, 0x6c, 0x6f, 0x2c, 0xbe, 0xe4,
-	0xeb, 0xab, 0xef, 0x12, 0xca, 0x82, 0xa5, 0xe7, 0x06, 0xac, 0xe3, 0x8d, 0x19, 0x45, 0x05, 0xa2,
-	0x41, 0x69, 0xc1, 0x82, 0xc0, 0x9a, 0xb2, 0x84, 0xdc, 0xe2, 0x25, 0xb9, 0xe0, 0x37, 0x13, 0xfa,
-	0xc2, 0xeb, 0xfc, 0x2e, 0x7d, 0x97, 0x98, 0x72, 0xe1, 0x4f, 0x6d, 0xa8, 0xae, 0x1f, 0xcd, 0xf9,
-	0xd9, 0xb8, 0xea, 0x74, 0x74, 0xc3, 0x50, 0xf7, 0xc8, 0x3e, 0xdc, 0xe3, 0xd3, 0x6f, 0x7b, 0x74,
-	0x45, 0x75, 0xf3, 0x6c, 0x40, 0x2f, 0xdb, 0x23, 0x53, 0xa7, 0x74, 0x40, 0x55, 0x89, 0xdc, 0x87,
-	0x1f, 0x74, 0x06, 0x97, 0xc3, 0xab, 0x91, 0x6e, 0xb6, 0xbb, 0x5d, 0xaa, 0x1b, 0x46, 0x2c, 0xca,
-	0x71, 0xd2, 0x1f, 0x8c, 0x9e, 0xeb, 0x34, 0x06, 0xee, 0x9e, 0xfe, 0x53, 0x82, 0xea, 0x39, 0x92,
-	0x0b, 0xf3, 0x5f, 0xf2, 0xef, 0xd1, 0xa7, 0xf0, 0x9e, 0x11, 0x5d, 0x2f, 0x9c, 0x30, 0x3b, 0x10,
-	0xdf, 0xdb, 0xfe, 0x60, 0xee, 0xd7, 0xd2, 0x20, 0xf1, 0x08, 0xfe, 0x12, 0x6a, 0x06, 0x73, 0xd3,
-	0xae, 0x24, 0x0f, 0xd6, 0xec, 0x6e, 0x36, 0xe6, 0xa6, 0x79, 0x1f, 0xc8, 0xcd, 0x82, 0x23, 0x47,
-	0xab, 0x26, 0xb9, 0xa5, 0x16, 0xf7, 0x6f, 0xf1, 0xee, 0xd9, 0xd3, 0xd7, 0x6f, 0x0e, 0xa4, 0x7f,
-	0xbc, 0x39, 0x90, 0xfe, 0xf3, 0xe6, 0x40, 0xfa, 0xcb, 0xdb, 0x03, 0xe9, 0x6f, 0x6f, 0x0f, 0xa4,
-	0xd7, 0x6f, 0x0f, 0x24, 0xa8, 0x39, 0x5e, 0xeb, 0x3a, 0x9c, 0x04, 0xc2, 0xf0, 0x19, 0x60, 0x0c,
-	0x86, 0x3c, 0x39, 0x43, 0xe9, 0xb7, 0xe2, 0x5f, 0x47, 0xd7, 0x45, 0x4c, 0xd6, 0x87, 0xff, 0x0b,
-	0x00, 0x00, 0xff, 0xff, 0xb4, 0x45, 0x01, 0xd3, 0x64, 0x12, 0x00, 0x00,
+	// 1807 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4f, 0x6f, 0x1b, 0xc7,
+	0x15, 0xd7, 0x92, 0x5c, 0x92, 0xfb, 0xf8, 0x6f, 0x3d, 0x71, 0xdd, 0xb5, 0x1a, 0x4b, 0x2a, 0x03,
+	0xd7, 0x72, 0x8b, 0xd0, 0x85, 0x5c, 0x14, 0x28, 0xe0, 0x36, 0xa0, 0xc9, 0x95, 0xac, 0x96, 0x22,
+	0x99, 0x21, 0x85, 0xd4, 0xbd, 0x2c, 0x56, 0xcb, 0x21, 0xb9, 0x08, 0xb9, 0xcb, 0xec, 0x1f, 0x27,
+	0xce, 0xb1, 0xc8, 0xad, 0x97, 0x9e, 0x8a, 0x7e, 0x80, 0x1e, 0x9a, 0x6f, 0xd1, 0xa3, 0x8f, 0xb9,
+	0xf4, 0x54, 0x20, 0x2d, 0xac, 0x2f, 0x52, 0xcc, 0x9b, 0x59, 0x92, 0x4b, 0x51, 0x2e, 0x98, 0x22,
+	0x17, 0x81, 0xf3, 0x7b, 0xef, 0xcd, 0xbc, 0x79, 0x7f, 0x7e, 0xf3, 0x56, 0x60, 0x2c, 0x02, 0x3f,
+	0xf2, 0xc3, 0x27, 0x93, 0xd8, 0x0e, 0x46, 0xe2, 0x6f, 0x03, 0x21, 0xa2, 0xe2, 0x62, 0xff, 0xe7,
+	0x13, 0x37, 0x9a, 0xc6, 0x57, 0x0d, 0xc7, 0x9f, 0x3f, 0x89, 0x02, 0xdf, 0xfb, 0x30, 0x0e, 0x9f,
+	0xa0, 0xc2, 0x55, 0x3c, 0x7e, 0x32, 0xf1, 0x27, 0x3e, 0x2e, 0xf0, 0x97, 0x30, 0xdc, 0x3f, 0x9c,
+	0xf8, 0xfe, 0x64, 0xc6, 0x56, 0x5a, 0x91, 0x3b, 0x67, 0x61, 0x64, 0xcf, 0x17, 0x42, 0xa1, 0xfe,
+	0x27, 0x05, 0xb2, 0x1d, 0x7f, 0x42, 0x4c, 0x28, 0x39, 0x53, 0xdb, 0x9b, 0x30, 0x8b, 0x6b, 0x18,
+	0xca, 0x91, 0x72, 0x5c, 0x3a, 0xd9, 0x6f, 0x08, 0xf3, 0x46, 0x62, 0xde, 0x18, 0x26, 0xe6, 0xcf,
+	0x8b, 0x6f, 0xbe, 0x3d, 0xdc, 0xfb, 0xf3, 0xbf, 0x0f, 0x15, 0x0a, 0xc2, 0x90, 0x8b, 0xc8, 0x43,
+	0xa8, 0xfa, 0x81, 0x3b, 0x71, 0x3d, 0x3b, 0xf2, 0x03, 0x6b, 0xe1, 0x8e, 0x8c, 0xcc, 0x91, 0x72,
+	0xac, 0xd1, 0xca, 0x0a, 0xed, 0xbb, 0x23, 0x72, 0x0f, 0xf2, 0xc2, 0xc8, 0xc8, 0xa2, 0x58, 0xae,
+	0xea, 0x5f, 0xab, 0x50, 0x6e, 0xf9, 0x5e, 0x14, 0xd8, 0x4e, 0x74, 0xc1, 0x22, 0x9b, 0x1c, 0x42,
+	0xc9, 0x91, 0x6b, 0xcb, 0x1d, 0xa1, 0x5b, 0x1a, 0x85, 0x04, 0x3a, 0x1f, 0x91, 0x07, 0x00, 0x01,
+	0xf3, 0x22, 0xb6, 0x7e, 0x98, 0x26, 0x10, 0x7e, 0xd0, 0x7d, 0x28, 0x4e, 0xfd, 0x30, 0x42, 0xa1,
+	0x38, 0xaa, 0xc0, 0xd7, 0x5c, 0xf4, 0x00, 0x20, 0x9c, 0xda, 0xc1, 0xc8, 0x9a, 0xda, 0xe1, 0xd4,
+	0xc8, 0x09, 0x4b, 0x44, 0x5e, 0xd8, 0xe1, 0x94, 0x9f, 0x2c, 0xc4, 0xae, 0x37, 0x62, 0x5f, 0x18,
+	0xea, 0x91, 0x72, 0xac, 0x52, 0x61, 0x71, 0xce, 0x11, 0xf2, 0x13, 0xa8, 0x09, 0x85, 0xb1, 0x3b,
+	0x63, 0x56, 0xe8, 0x7e, 0xc9, 0x8c, 0xfc, 0x91, 0x72, 0x9c, 0xa5, 0x15, 0x84, 0x4f, 0xdd, 0x19,
+	0x1b, 0xb8, 0x5f, 0x32, 0xf2, 0x23, 0xd0, 0x50, 0x03, 0x8f, 0x29, 0xe0, 0x31, 0x45, 0x0e, 0xe0,
+	0x29, 0x2d, 0xe1, 0xbe, 0x15, 0x46, 0x76, 0x10, 0x19, 0xc5, 0x1d, 0xa2, 0x8e, 0x97, 0x1c, 0x70,
+	0x33, 0xf2, 0x11, 0x14, 0x71, 0x13, 0xe6, 0x8d, 0x0c, 0x6d, 0x87, 0x2d, 0x0a, 0xdc, 0xca, 0xf4,
+	0x46, 0xdc, 0x45, 0x2c, 0x30, 0x0c, 0x13, 0x08, 0x17, 0x11, 0x90, 0x71, 0x62, 0xa1, 0x13, 0xf8,
+	0x9f, 0xa3, 0xb4, 0x24, 0xe2, 0x24, 0x10, 0x2e, 0xbe, 0x0b, 0xea, 0x22, 0x70, 0x1d, 0x66, 0x94,
+	0xf1, 0xf2, 0x62, 0xc1, 0x13, 0x6c, 0xcf, 0xfd, 0xd8, 0x8b, 0x8c, 0x0a, 0xc2, 0x72, 0x45, 0x7e,
+	0x06, 0x77, 0x1c, 0x7f, 0x36, 0xb3, 0x23, 0x16, 0xd8, 0x33, 0x4b, 0xaa, 0x54, 0x51, 0x45, 0x5f,
+	0x09, 0x9a, 0x42, 0xd9, 0x84, 0xda, 0xc2, 0x7e, 0xed, 0xc7, 0x91, 0x15, 0x3a, 0x53, 0x36, 0x8a,
+	0x67, 0xcc, 0xa8, 0x1d, 0x29, 0xc7, 0xd5, 0x93, 0xf7, 0x1b, 0xa2, 0x39, 0xd6, 0x4b, 0xa5, 0x31,
+	0x90, 0x3a, 0xb4, 0x2a, 0x8c, 0x92, 0x35, 0xcf, 0xa4, 0x17, 0xcf, 0x2d, 0x81, 0x86, 0x86, 0x2e,
+	0x32, 0xe9, 0xc5, 0xf3, 0xbe, 0x40, 0xea, 0xbf, 0x80, 0xe2, 0x52, 0xb9, 0x04, 0x85, 0x8b, 0x5e,
+	0x77, 0xf8, 0xa2, 0xf3, 0x52, 0xdf, 0x23, 0x15, 0xd0, 0x3e, 0xbe, 0x6c, 0xd2, 0xa1, 0x49, 0x3b,
+	0x2f, 0x75, 0x85, 0x94, 0xa1, 0xd8, 0xec, 0x76, 0x2f, 0x9b, 0x9d, 0xce, 0x4b, 0x3d, 0x53, 0xff,
+	0xbb, 0x0a, 0xc5, 0xc4, 0x01, 0xf2, 0x2b, 0x28, 0x26, 0x45, 0x29, 0x7b, 0xe7, 0xbd, 0x2d, 0x3e,
+	0x8a, 0xd8, 0x7f, 0xf3, 0xed, 0xa1, 0x42, 0x97, 0xea, 0xe4, 0x29, 0xa8, 0x61, 0x64, 0x47, 0x0c,
+	0x8b, 0xb7, 0x7a, 0xf2, 0x60, 0xc3, 0x6e, 0xf9, 0x63, 0xc0, 0x95, 0xa8, 0xd0, 0x25, 0x8f, 0x41,
+	0x97, 0x65, 0x1f, 0xba, 0x13, 0xcf, 0x8e, 0xe2, 0x40, 0xb4, 0x52, 0x99, 0xd6, 0x04, 0x3e, 0x48,
+	0x60, 0xde, 0x92, 0xd8, 0x02, 0x2b, 0xc5, 0x1c, 0x2a, 0x56, 0x38, 0xba, 0x52, 0xa3, 0x40, 0x64,
+	0x9a, 0xb9, 0x22, 0x1b, 0x09, 0x1e, 0x50, 0x77, 0x28, 0x27, 0x5d, 0xd8, 0x0f, 0xd0, 0x1c, 0xd9,
+	0xe0, 0x31, 0xe8, 0x6b, 0x7b, 0x8a, 0xc3, 0xf3, 0xc2, 0xcb, 0x95, 0xae, 0x38, 0xfe, 0x31, 0x48,
+	0x1a, 0xb1, 0x66, 0xfe, 0xc4, 0x28, 0x1c, 0x65, 0x8f, 0x4b, 0x27, 0x20, 0x43, 0xd1, 0xf1, 0x27,
+	0x54, 0x13, 0x52, 0x4e, 0x55, 0x5d, 0xd0, 0x67, 0x76, 0x18, 0x59, 0x73, 0x7f, 0xe4, 0x8e, 0x5f,
+	0x0b, 0x3f, 0x77, 0xe9, 0x9c, 0x2a, 0xb7, 0xbe, 0x40, 0x63, 0xf4, 0xf2, 0x11, 0xd4, 0x44, 0xf5,
+	0xaf, 0x9c, 0xd4, 0xd0, 0xc9, 0x2a, 0xc2, 0x2b, 0x1f, 0x7f, 0x0c, 0xe5, 0x45, 0xc0, 0x16, 0x76,
+	0x20, 0xd9, 0x46, 0x74, 0x4a, 0x29, 0xc1, 0x78, 0x37, 0x7c, 0x08, 0x64, 0xa9, 0xb2, 0xda, 0xae,
+	0x84, 0xdb, 0xdd, 0x49, 0x24, 0xcb, 0x1d, 0xeb, 0x0c, 0x2a, 0xa9, 0xf4, 0x12, 0x0d, 0xd4, 0x36,
+	0x6d, 0x9e, 0x0e, 0xf5, 0x3d, 0x02, 0x90, 0x1f, 0x9c, 0x9f, 0x75, 0xcd, 0xb6, 0xa8, 0xbc, 0xcb,
+	0x7e, 0xa7, 0xd7, 0x6c, 0x9b, 0x6d, 0x3d, 0x43, 0x8a, 0x90, 0xeb, 0xf4, 0x06, 0x43, 0x3d, 0xcb,
+	0xf1, 0x56, 0xb3, 0xdb, 0x32, 0x3b, 0x66, 0x5b, 0xcf, 0x71, 0x8b, 0x56, 0xa7, 0x37, 0x30, 0xdb,
+	0xba, 0xca, 0xeb, 0x98, 0x9a, 0x5d, 0xf3, 0x13, 0xb3, 0xad, 0xe7, 0xeb, 0x5f, 0xe5, 0xa0, 0x82,
+	0x7c, 0x14, 0xf9, 0x01, 0x43, 0x5e, 0x4d, 0xd3, 0xa6, 0xb2, 0x49, 0x9b, 0x29, 0xce, 0xca, 0x6c,
+	0x70, 0x56, 0x22, 0x44, 0xca, 0xcb, 0x62, 0xef, 0xa2, 0x10, 0xd9, 0x2e, 0x4d, 0x68, 0xb9, 0xff,
+	0x9f, 0xd0, 0xd4, 0xef, 0x42, 0x68, 0x8f, 0xa0, 0xe6, 0x4c, 0x99, 0xf3, 0xa9, 0x35, 0x0e, 0xd8,
+	0x67, 0x31, 0xf3, 0x9c, 0xd7, 0x58, 0x77, 0x2a, 0xad, 0x22, 0x7c, 0x9a, 0xa0, 0x2b, 0xe6, 0x1b,
+	0x33, 0x86, 0xe4, 0x9c, 0x95, 0xcc, 0x77, 0xca, 0xd8, 0x1a, 0xf3, 0x71, 0x69, 0x11, 0xa5, 0x92,
+	0xf9, 0xb8, 0x78, 0xf9, 0x42, 0x38, 0xc8, 0x62, 0xda, 0xda, 0x0b, 0xd1, 0x42, 0xfe, 0x7a, 0x08,
+	0xd5, 0xb9, 0xeb, 0xb9, 0xf3, 0x78, 0x6e, 0x21, 0x1a, 0x62, 0xc5, 0xa8, 0xb4, 0x22, 0xd1, 0x01,
+	0x82, 0x9c, 0x13, 0x03, 0xe6, 0xf8, 0xaf, 0x58, 0x60, 0x45, 0xd3, 0x80, 0x85, 0x53, 0x7f, 0x26,
+	0x78, 0x56, 0xa5, 0xba, 0x14, 0x0c, 0x13, 0x7c, 0x83, 0x8d, 0xcb, 0x9b, 0x6c, 0x9c, 0x62, 0xf2,
+	0x4a, 0x9a, 0xc9, 0xeb, 0x7f, 0xcb, 0x43, 0x6d, 0x59, 0x06, 0xbc, 0xde, 0xe2, 0x90, 0x9c, 0x42,
+	0x4d, 0x24, 0x93, 0x63, 0xd6, 0x9c, 0x45, 0xb6, 0xe4, 0xaf, 0xbb, 0xb2, 0xf9, 0x52, 0x75, 0xb3,
+	0x46, 0x60, 0x95, 0x71, 0xaa, 0xa0, 0x7e, 0x99, 0x66, 0xb1, 0xa3, 0x4d, 0x6b, 0x71, 0x5c, 0x83,
+	0xeb, 0xa6, 0x88, 0xec, 0x29, 0x68, 0x09, 0x13, 0x86, 0x46, 0x16, 0xdb, 0xbe, 0xb6, 0xc1, 0x80,
+	0xcf, 0x73, 0xfc, 0x50, 0xba, 0xd2, 0xdb, 0xca, 0x7e, 0xb9, 0xed, 0xec, 0x47, 0x81, 0x88, 0x80,
+	0x04, 0xcc, 0x61, 0xee, 0x2b, 0xf6, 0x1d, 0x68, 0x0d, 0xed, 0xa9, 0x30, 0x97, 0xb4, 0xb6, 0xce,
+	0x55, 0xf9, 0x77, 0x71, 0xd5, 0x19, 0x94, 0x9d, 0x38, 0xc0, 0x62, 0xc6, 0x83, 0x0b, 0x3b, 0x1c,
+	0x5c, 0x92, 0x96, 0xb7, 0x91, 0x54, 0x71, 0x2b, 0x49, 0x99, 0x50, 0xe6, 0x46, 0xf6, 0xcc, 0x12,
+	0xf9, 0xd0, 0x30, 0x1f, 0xf5, 0x5b, 0xf2, 0x41, 0x51, 0x55, 0x64, 0xa4, 0x14, 0xac, 0x16, 0xdf,
+	0x03, 0xd7, 0x8d, 0x41, 0x5b, 0x66, 0x7f, 0x9d, 0xe7, 0x2a, 0xa0, 0x09, 0x6e, 0x3b, 0xef, 0x9e,
+	0xe9, 0x0a, 0x12, 0xd7, 0x65, 0xb7, 0xcb, 0x17, 0x19, 0xa2, 0x43, 0xb9, 0xdf, 0xa4, 0xc3, 0xf3,
+	0x66, 0xc7, 0x92, 0x8c, 0x97, 0x70, 0x5f, 0x8e, 0xff, 0x6a, 0xf7, 0xba, 0xa6, 0xae, 0xa6, 0x58,
+	0x30, 0x5f, 0xff, 0x08, 0x4a, 0x6b, 0xb7, 0x22, 0x05, 0xc8, 0x76, 0xcd, 0x4f, 0xf4, 0x3d, 0x52,
+	0x83, 0x52, 0xb2, 0x17, 0x07, 0xf0, 0x24, 0xf3, 0xf7, 0xfd, 0x73, 0x8a, 0x9c, 0xaa, 0x81, 0x8a,
+	0x7c, 0xa9, 0x67, 0xeb, 0x5f, 0x2b, 0x70, 0xa7, 0x35, 0xb5, 0x67, 0x33, 0xe6, 0x4d, 0xd8, 0xc7,
+	0x31, 0x0b, 0x23, 0xd7, 0xf7, 0x36, 0xc6, 0x45, 0x65, 0x73, 0x5c, 0x5c, 0x1f, 0x34, 0x33, 0xe9,
+	0x41, 0x93, 0xcf, 0xb0, 0xd3, 0xd8, 0xfb, 0x54, 0x4e, 0x92, 0x59, 0xc1, 0x13, 0x08, 0x89, 0x49,
+	0xf2, 0x2e, 0xa8, 0x9e, 0xef, 0x39, 0x4c, 0x0e, 0xa1, 0x62, 0x41, 0x3e, 0x80, 0x0a, 0xfb, 0x62,
+	0xc1, 0x9c, 0xc8, 0xb2, 0xbd, 0xf0, 0x73, 0x16, 0x60, 0xd1, 0x6a, 0xb4, 0x2c, 0xc0, 0x26, 0x62,
+	0xf5, 0x3f, 0x66, 0xe1, 0x7e, 0x3f, 0xf0, 0xfd, 0x71, 0x6f, 0x4c, 0xd9, 0x62, 0xe6, 0x3a, 0x76,
+	0xc4, 0x96, 0xbe, 0x93, 0xdf, 0x40, 0xf1, 0x33, 0xe9, 0xbf, 0xec, 0x6a, 0x23, 0xe9, 0xad, 0xcd,
+	0xfb, 0xad, 0x8f, 0x26, 0x89, 0x0d, 0xf9, 0x1d, 0x54, 0x9d, 0x44, 0x51, 0xd4, 0x6f, 0x66, 0x87,
+	0xfa, 0xad, 0x2c, 0x6d, 0xb1, 0x82, 0x53, 0xd4, 0x94, 0xdd, 0x18, 0x32, 0xb7, 0x94, 0x77, 0x6e,
+	0x6b, 0x79, 0x1f, 0x42, 0x09, 0xe3, 0x9c, 0x8a, 0x09, 0x70, 0x48, 0x44, 0x84, 0xfc, 0x76, 0x6d,
+	0xdc, 0x11, 0x3e, 0xe7, 0x77, 0xf0, 0xb9, 0x9c, 0x0c, 0x45, 0xc9, 0xd7, 0xcc, 0xc6, 0xe8, 0x54,
+	0xd8, 0x32, 0x3a, 0xd5, 0xbf, 0x52, 0xe0, 0x1e, 0x6f, 0xac, 0x1b, 0x41, 0x0d, 0xd3, 0x0f, 0xa9,
+	0xb2, 0xf1, 0x90, 0x5e, 0x24, 0x5f, 0x10, 0x49, 0xc0, 0x43, 0x23, 0x83, 0x64, 0x72, 0x20, 0xb3,
+	0x84, 0x0f, 0xc4, 0xcd, 0x5d, 0x25, 0x21, 0x56, 0xd1, 0x78, 0x89, 0xd6, 0xff, 0x99, 0x81, 0x1f,
+	0xde, 0x62, 0xf1, 0x6e, 0x3f, 0xd2, 0xa5, 0x9d, 0xd9, 0x2c, 0xed, 0x4d, 0x2a, 0xc8, 0xde, 0xa4,
+	0x82, 0x87, 0x50, 0x4d, 0xee, 0x20, 0x5f, 0xc3, 0x9c, 0x78, 0xe9, 0x12, 0x54, 0x3c, 0x88, 0xcf,
+	0x40, 0x5b, 0x5d, 0x55, 0xc5, 0xab, 0xde, 0x5e, 0x90, 0x92, 0xf5, 0x97, 0x06, 0x9c, 0x4b, 0xe5,
+	0x99, 0xbb, 0xe7, 0x35, 0xf1, 0x16, 0xd3, 0xba, 0x9d, 0xb8, 0x0a, 0xb7, 0x11, 0xd7, 0xb5, 0x02,
+	0xf7, 0x5b, 0x38, 0x36, 0xac, 0xbf, 0x78, 0x94, 0xa1, 0x67, 0xff, 0x33, 0xb2, 0xef, 0xfa, 0x3a,
+	0xfd, 0x00, 0x2a, 0x81, 0xd8, 0x26, 0x15, 0xda, 0xf2, 0x12, 0xe4, 0x4a, 0x67, 0x90, 0xac, 0xc5,
+	0xb5, 0x77, 0x99, 0xa9, 0x4a, 0xd2, 0x12, 0xaf, 0xfd, 0x3e, 0x68, 0xab, 0xdb, 0xaa, 0x78, 0xdb,
+	0x15, 0x50, 0xff, 0x8b, 0x02, 0x79, 0xca, 0xc2, 0x78, 0x16, 0x91, 0x47, 0x90, 0x73, 0xfc, 0x91,
+	0xf8, 0x27, 0x40, 0x75, 0xf9, 0x21, 0x43, 0x59, 0xb8, 0xf0, 0xbd, 0x90, 0xb5, 0xfc, 0x11, 0xa3,
+	0xa8, 0x40, 0x0c, 0x28, 0xcc, 0x59, 0x18, 0xda, 0x13, 0x96, 0x70, 0x9e, 0x5c, 0x92, 0x73, 0x7e,
+	0x33, 0xa1, 0x2f, 0xbc, 0xce, 0xee, 0xd2, 0x84, 0x89, 0x29, 0x17, 0xfe, 0xd4, 0x81, 0xf2, 0xfa,
+	0xd1, 0x9c, 0xb6, 0x07, 0x97, 0xad, 0x96, 0x39, 0x18, 0xe8, 0x7b, 0x64, 0x1f, 0xee, 0xf1, 0x21,
+	0xb9, 0x39, 0xbc, 0xa4, 0xa6, 0x75, 0xda, 0xa3, 0x17, 0xcd, 0xa1, 0x65, 0x52, 0xda, 0xa3, 0xba,
+	0x42, 0xee, 0xc3, 0x0f, 0x5a, 0xbd, 0x8b, 0xfe, 0xe5, 0xd0, 0xb4, 0x9a, 0xed, 0x36, 0x35, 0x07,
+	0x03, 0x29, 0xca, 0xf0, 0xb7, 0xa0, 0x37, 0x7c, 0x61, 0x52, 0x09, 0xdc, 0x3d, 0xf9, 0x97, 0x02,
+	0xe5, 0x33, 0x64, 0x1a, 0x16, 0xbc, 0xe2, 0x1f, 0xb0, 0xcf, 0xe0, 0xbd, 0x41, 0x7c, 0x35, 0x77,
+	0xa3, 0xf4, 0xdc, 0x7c, 0x6f, 0xfb, 0x3b, 0xba, 0x5f, 0x59, 0x05, 0x89, 0x47, 0xf0, 0xd7, 0x50,
+	0x19, 0x30, 0x6f, 0xd5, 0x9b, 0xe4, 0xc1, 0x9a, 0xdd, 0xcd, 0xf6, 0xdc, 0x34, 0xef, 0x02, 0xb9,
+	0x59, 0x70, 0xe4, 0x68, 0xd9, 0x2a, 0xb7, 0xd4, 0xe2, 0xfe, 0x2d, 0xde, 0x3d, 0x7f, 0xf6, 0xe6,
+	0xed, 0x81, 0xf2, 0xcd, 0xdb, 0x03, 0xe5, 0x3f, 0x6f, 0x0f, 0x94, 0xbf, 0x5e, 0x1f, 0x28, 0xff,
+	0xb8, 0x3e, 0x50, 0xde, 0x5c, 0x1f, 0x28, 0x50, 0x71, 0xfd, 0xc6, 0x55, 0x34, 0x0e, 0x85, 0xe1,
+	0x73, 0xc0, 0x18, 0xf4, 0x79, 0x72, 0xfa, 0xca, 0x1f, 0xc4, 0x7f, 0x9d, 0xae, 0xf2, 0x98, 0xac,
+	0xa7, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x51, 0xfa, 0x97, 0xce, 0x9f, 0x12, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1692,18 +1672,14 @@ func (m *Log) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x12
 	}
-	if m.ChangeTime != nil {
-		{
-			size, err := m.ChangeTime.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintGuard(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0xa
+	n1, err1 := github_com_tron_us_protobuf_types.StdTimeMarshalTo(m.ChangeTime, dAtA[i-github_com_tron_us_protobuf_types.SizeOfStdTime(m.ChangeTime):])
+	if err1 != nil {
+		return 0, err1
 	}
+	i -= n1
+	i = encodeVarintGuard(dAtA, i, uint64(n1))
+	i--
+	dAtA[i] = 0xa
 	return len(dAtA) - i, nil
 }
 
@@ -1937,18 +1913,16 @@ func (m *Contract) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x10
 	}
-	if m.Contract != nil {
-		{
-			size, err := m.Contract.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintGuard(dAtA, i, uint64(size))
+	{
+		size, err := m.ContractMeta.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
 		}
-		i--
-		dAtA[i] = 0xa
+		i -= size
+		i = encodeVarintGuard(dAtA, i, uint64(size))
 	}
+	i--
+	dAtA[i] = 0xa
 	return len(dAtA) - i, nil
 }
 
@@ -2164,18 +2138,16 @@ func (m *FileStoreStatus) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x10
 	}
-	if m.FileStoreMeta != nil {
-		{
-			size, err := m.FileStoreMeta.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintGuard(dAtA, i, uint64(size))
+	{
+		size, err := m.FileStoreMeta.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
 		}
-		i--
-		dAtA[i] = 0xa
+		i -= size
+		i = encodeVarintGuard(dAtA, i, uint64(size))
 	}
+	i--
+	dAtA[i] = 0xa
 	return len(dAtA) - i, nil
 }
 
@@ -2307,18 +2279,16 @@ func (m *ProofOfReplicateChallenge) MarshalToSizedBuffer(dAtA []byte) (int, erro
 	i = encodeVarintGuard(dAtA, i, uint64(n13))
 	i--
 	dAtA[i] = 0x12
-	if m.Question != nil {
-		{
-			size, err := m.Question.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintGuard(dAtA, i, uint64(size))
+	{
+		size, err := m.ChallengeQuestion.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
 		}
-		i--
-		dAtA[i] = 0xa
+		i -= size
+		i = encodeVarintGuard(dAtA, i, uint64(size))
 	}
+	i--
+	dAtA[i] = 0xa
 	return len(dAtA) - i, nil
 }
 
@@ -2579,10 +2549,8 @@ func (m *Log) Size() (n int) {
 	}
 	var l int
 	_ = l
-	if m.ChangeTime != nil {
-		l = m.ChangeTime.Size()
-		n += 1 + l + sovGuard(uint64(l))
-	}
+	l = github_com_tron_us_protobuf_types.SizeOfStdTime(m.ChangeTime)
+	n += 1 + l + sovGuard(uint64(l))
 	l = len(m.OriginatorPid)
 	if l > 0 {
 		n += 1 + l + sovGuard(uint64(l))
@@ -2668,10 +2636,8 @@ func (m *Contract) Size() (n int) {
 	}
 	var l int
 	_ = l
-	if m.Contract != nil {
-		l = m.Contract.Size()
-		n += 1 + l + sovGuard(uint64(l))
-	}
+	l = m.ContractMeta.Size()
+	n += 1 + l + sovGuard(uint64(l))
 	if m.State != 0 {
 		n += 1 + sovGuard(uint64(m.State))
 	}
@@ -2774,10 +2740,8 @@ func (m *FileStoreStatus) Size() (n int) {
 	}
 	var l int
 	_ = l
-	if m.FileStoreMeta != nil {
-		l = m.FileStoreMeta.Size()
-		n += 1 + l + sovGuard(uint64(l))
-	}
+	l = m.FileStoreMeta.Size()
+	n += 1 + l + sovGuard(uint64(l))
 	if m.State != 0 {
 		n += 1 + sovGuard(uint64(m.State))
 	}
@@ -2859,10 +2823,8 @@ func (m *ProofOfReplicateChallenge) Size() (n int) {
 	}
 	var l int
 	_ = l
-	if m.Question != nil {
-		l = m.Question.Size()
-		n += 1 + l + sovGuard(uint64(l))
-	}
+	l = m.ChallengeQuestion.Size()
+	n += 1 + l + sovGuard(uint64(l))
 	l = github_com_tron_us_protobuf_types.SizeOfStdTime(m.ChallengeTime)
 	n += 1 + l + sovGuard(uint64(l))
 	l = len(m.GuardPid)
@@ -3065,10 +3027,7 @@ func (m *Log) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if m.ChangeTime == nil {
-				m.ChangeTime = &types.Timestamp{}
-			}
-			if err := m.ChangeTime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := github_com_tron_us_protobuf_types.StdTimeUnmarshal(&m.ChangeTime, dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
@@ -3669,7 +3628,7 @@ func (m *Contract) Unmarshal(dAtA []byte) error {
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Contract", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field ContractMeta", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -3696,10 +3655,7 @@ func (m *Contract) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if m.Contract == nil {
-				m.Contract = &ContractMeta{}
-			}
-			if err := m.Contract.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := m.ContractMeta.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
@@ -4488,9 +4444,6 @@ func (m *FileStoreStatus) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if m.FileStoreMeta == nil {
-				m.FileStoreMeta = &FileStoreMeta{}
-			}
 			if err := m.FileStoreMeta.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
@@ -4543,7 +4496,7 @@ func (m *FileStoreStatus) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Contracts = append(m.Contracts, &Contract{})
+			m.Contracts = append(m.Contracts, Contract{})
 			if err := m.Contracts[len(m.Contracts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
@@ -5058,7 +5011,7 @@ func (m *ProofOfReplicateChallenge) Unmarshal(dAtA []byte) error {
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Question", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field ChallengeQuestion", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -5085,10 +5038,7 @@ func (m *ProofOfReplicateChallenge) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if m.Question == nil {
-				m.Question = &ChallengeQuestion{}
-			}
-			if err := m.Question.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := m.ChallengeQuestion.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
@@ -5405,7 +5355,7 @@ func (m *FileChallengeQuestions) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.ShardQuestions = append(m.ShardQuestions, &ShardChallengeQuestions{})
+			m.ShardQuestions = append(m.ShardQuestions, ShardChallengeQuestions{})
 			if err := m.ShardQuestions[len(m.ShardQuestions)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
@@ -5608,7 +5558,7 @@ func (m *ShardChallengeQuestions) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Questions = append(m.Questions, &ChallengeQuestion{})
+			m.Questions = append(m.Questions, ChallengeQuestion{})
 			if err := m.Questions[len(m.Questions)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
diff --git a/protos/guard/guard.proto b/protos/guard/guard.proto
index a749013..2c6dc58 100644
--- a/protos/guard/guard.proto
+++ b/protos/guard/guard.proto
@@ -26,7 +26,10 @@ service GuardService {
 }
 
 message Log {
-  google.protobuf.Timestamp change_time = 1;
+  google.protobuf.Timestamp change_time = 1 [
+    (gogoproto.nullable) = false,
+    (gogoproto.stdtime) = true
+  ];
   string originator_pid = 2;
   string change = 3;
 }
@@ -70,7 +73,10 @@ message ContractMeta {
 
 message Contract {
   //the contract executor record, changed frequently after proposal
-  ContractMeta contract = 1;
+  ContractMeta contract = 1 [
+    (gogoproto.embed) = true,
+    (gogoproto.nullable) = false
+  ];
   enum ContractState {
     DRAFT = 0; //the contract was draft, but the escrow service did not received the money
     SIGNED = 1; // the escrow service received the money from renter, the contract was start.
@@ -122,7 +128,10 @@ message FileStoreMeta {
 }
 
 message FileStoreStatus {
-  FileStoreMeta file_store_meta = 1;
+  FileStoreMeta file_store_meta = 1 [
+    (gogoproto.embed) = true,
+    (gogoproto.nullable) = false
+  ];
   enum MetaState {
     DRAFT = 0; //the proposal was submit by renter
     UPLOADING = 1; //all related contracts were signed, and renter is uploading shards and questions
@@ -133,7 +142,7 @@ message FileStoreStatus {
     CANCELED = 6; //reserved for the cancel contract
   }
   MetaState state = 2;
-  repeated Contract contracts = 3;
+  repeated Contract contracts = 3 [(gogoproto.nullable) = false];
   bytes renter_signature = 4; //rental's signature for the first full file status with contracts
   google.protobuf.Timestamp guard_receive_time = 5 [
     (gogoproto.nullable) = false,
@@ -165,7 +174,10 @@ message ChallengeQuestion {
 }
 
 message ProofOfReplicateChallenge {
-  ChallengeQuestion question = 1; //of course expect_answer should be clear before send to the host`
+  ChallengeQuestion question = 1 [
+    (gogoproto.embed) = true,
+    (gogoproto.nullable) = false
+  ]; //of course expect_answer should be clear before send to the host`
   google.protobuf.Timestamp challenge_time = 2 [
     (gogoproto.nullable) = false,
     (gogoproto.stdtime) = true
@@ -182,7 +194,7 @@ message ProofOfReplicateChallenge {
 
 message FileChallengeQuestions {
   string file_hash = 1;
-  repeated ShardChallengeQuestions shard_questions = 2;
+  repeated ShardChallengeQuestions shard_questions = 2 [(gogoproto.nullable) = false];
 }
 
 message ShardChallengeQuestions {
@@ -190,7 +202,7 @@ message ShardChallengeQuestions {
   string shard_hash = 2;
   string preparer_pid = 3; //challenge questions preparer's peerId, it is renter peerId at phase 1
   int32 question_count = 4;
-  repeated ChallengeQuestion questions = 5;
+  repeated ChallengeQuestion questions = 5 [(gogoproto.nullable) = false];
   google.protobuf.Timestamp prepare_time = 6 [
     (gogoproto.nullable) = false,
     (gogoproto.stdtime) = true