diff --git a/lib/go/si/si.pb.go b/lib/go/si/si.pb.go
index 9b403c2..611f9e8 100644
--- a/lib/go/si/si.pb.go
+++ b/lib/go/si/si.pb.go
@@ -53,7 +53,7 @@ func (x TerminationType) String() string {
 	return proto.EnumName(TerminationType_name, int32(x))
 }
 func (TerminationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{0}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{0}
 }
 
 // Action from RM
@@ -97,7 +97,7 @@ func (x NodeInfo_ActionFromRM) String() string {
 	return proto.EnumName(NodeInfo_ActionFromRM_name, int32(x))
 }
 func (NodeInfo_ActionFromRM) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{23, 0}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{23, 0}
 }
 
 // container scheduling states
@@ -136,7 +136,7 @@ func (x UpdateContainerSchedulingStateRequest_SchedulingState) String() string {
 	return proto.EnumName(UpdateContainerSchedulingStateRequest_SchedulingState_name, int32(x))
 }
 func (UpdateContainerSchedulingStateRequest_SchedulingState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{26, 0}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{26, 0}
 }
 
 type EventRecord_Type int32
@@ -169,7 +169,7 @@ func (x EventRecord_Type) String() string {
 	return proto.EnumName(EventRecord_Type_name, int32(x))
 }
 func (EventRecord_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{28, 0}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{28, 0}
 }
 
 //
@@ -188,17 +188,19 @@ type RegisterResourceManagerRequest struct {
 	// Pass the build information of k8shim to core.
 	BuildInfo map[string]string `protobuf:"bytes,4,rep,name=buildInfo,proto3" json:"buildInfo,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Pass the serialized configuration for this policyGroup to core.
-	Config               string   `protobuf:"bytes,5,opt,name=config,proto3" json:"config,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Config string `protobuf:"bytes,5,opt,name=config,proto3" json:"config,omitempty"`
+	// Additional configuration key/value pairs for configuration not related to the policyGroup.
+	ExtraConfig          map[string]string `protobuf:"bytes,6,rep,name=extraConfig,proto3" json:"extraConfig,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
 func (m *RegisterResourceManagerRequest) Reset()         { *m = RegisterResourceManagerRequest{} }
 func (m *RegisterResourceManagerRequest) String() string { return proto.CompactTextString(m) }
 func (*RegisterResourceManagerRequest) ProtoMessage()    {}
 func (*RegisterResourceManagerRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{0}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{0}
 }
 func (m *RegisterResourceManagerRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RegisterResourceManagerRequest.Unmarshal(m, b)
@@ -253,6 +255,13 @@ func (m *RegisterResourceManagerRequest) GetConfig() string {
 	return ""
 }
 
+func (m *RegisterResourceManagerRequest) GetExtraConfig() map[string]string {
+	if m != nil {
+		return m.ExtraConfig
+	}
+	return nil
+}
+
 // Upon success, scheduler returns RegisterResourceManagerResponse to RM, otherwise RM receives exception.
 type RegisterResourceManagerResponse struct {
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -264,7 +273,7 @@ func (m *RegisterResourceManagerResponse) Reset()         { *m = RegisterResourc
 func (m *RegisterResourceManagerResponse) String() string { return proto.CompactTextString(m) }
 func (*RegisterResourceManagerResponse) ProtoMessage()    {}
 func (*RegisterResourceManagerResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{1}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{1}
 }
 func (m *RegisterResourceManagerResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RegisterResourceManagerResponse.Unmarshal(m, b)
@@ -300,7 +309,7 @@ func (m *AllocationRequest) Reset()         { *m = AllocationRequest{} }
 func (m *AllocationRequest) String() string { return proto.CompactTextString(m) }
 func (*AllocationRequest) ProtoMessage()    {}
 func (*AllocationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{2}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{2}
 }
 func (m *AllocationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AllocationRequest.Unmarshal(m, b)
@@ -358,7 +367,7 @@ func (m *ApplicationRequest) Reset()         { *m = ApplicationRequest{} }
 func (m *ApplicationRequest) String() string { return proto.CompactTextString(m) }
 func (*ApplicationRequest) ProtoMessage()    {}
 func (*ApplicationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{3}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{3}
 }
 func (m *ApplicationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplicationRequest.Unmarshal(m, b)
@@ -413,7 +422,7 @@ func (m *NodeRequest) Reset()         { *m = NodeRequest{} }
 func (m *NodeRequest) String() string { return proto.CompactTextString(m) }
 func (*NodeRequest) ProtoMessage()    {}
 func (*NodeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{4}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{4}
 }
 func (m *NodeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodeRequest.Unmarshal(m, b)
@@ -466,7 +475,7 @@ func (m *AllocationResponse) Reset()         { *m = AllocationResponse{} }
 func (m *AllocationResponse) String() string { return proto.CompactTextString(m) }
 func (*AllocationResponse) ProtoMessage()    {}
 func (*AllocationResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{5}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{5}
 }
 func (m *AllocationResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AllocationResponse.Unmarshal(m, b)
@@ -530,7 +539,7 @@ func (m *ApplicationResponse) Reset()         { *m = ApplicationResponse{} }
 func (m *ApplicationResponse) String() string { return proto.CompactTextString(m) }
 func (*ApplicationResponse) ProtoMessage()    {}
 func (*ApplicationResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{6}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{6}
 }
 func (m *ApplicationResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplicationResponse.Unmarshal(m, b)
@@ -585,7 +594,7 @@ func (m *NodeResponse) Reset()         { *m = NodeResponse{} }
 func (m *NodeResponse) String() string { return proto.CompactTextString(m) }
 func (*NodeResponse) ProtoMessage()    {}
 func (*NodeResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{7}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{7}
 }
 func (m *NodeResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodeResponse.Unmarshal(m, b)
@@ -637,7 +646,7 @@ func (m *UpdatedApplication) Reset()         { *m = UpdatedApplication{} }
 func (m *UpdatedApplication) String() string { return proto.CompactTextString(m) }
 func (*UpdatedApplication) ProtoMessage()    {}
 func (*UpdatedApplication) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{8}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{8}
 }
 func (m *UpdatedApplication) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdatedApplication.Unmarshal(m, b)
@@ -699,7 +708,7 @@ func (m *RejectedApplication) Reset()         { *m = RejectedApplication{} }
 func (m *RejectedApplication) String() string { return proto.CompactTextString(m) }
 func (*RejectedApplication) ProtoMessage()    {}
 func (*RejectedApplication) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{9}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{9}
 }
 func (m *RejectedApplication) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RejectedApplication.Unmarshal(m, b)
@@ -745,7 +754,7 @@ func (m *AcceptedApplication) Reset()         { *m = AcceptedApplication{} }
 func (m *AcceptedApplication) String() string { return proto.CompactTextString(m) }
 func (*AcceptedApplication) ProtoMessage()    {}
 func (*AcceptedApplication) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{10}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{10}
 }
 func (m *AcceptedApplication) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AcceptedApplication.Unmarshal(m, b)
@@ -786,7 +795,7 @@ func (m *RejectedNode) Reset()         { *m = RejectedNode{} }
 func (m *RejectedNode) String() string { return proto.CompactTextString(m) }
 func (*RejectedNode) ProtoMessage()    {}
 func (*RejectedNode) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{11}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{11}
 }
 func (m *RejectedNode) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RejectedNode.Unmarshal(m, b)
@@ -832,7 +841,7 @@ func (m *AcceptedNode) Reset()         { *m = AcceptedNode{} }
 func (m *AcceptedNode) String() string { return proto.CompactTextString(m) }
 func (*AcceptedNode) ProtoMessage()    {}
 func (*AcceptedNode) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{12}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{12}
 }
 func (m *AcceptedNode) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AcceptedNode.Unmarshal(m, b)
@@ -871,7 +880,7 @@ func (m *Resource) Reset()         { *m = Resource{} }
 func (m *Resource) String() string { return proto.CompactTextString(m) }
 func (*Resource) ProtoMessage()    {}
 func (*Resource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{13}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{13}
 }
 func (m *Resource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Resource.Unmarshal(m, b)
@@ -910,7 +919,7 @@ func (m *Quantity) Reset()         { *m = Quantity{} }
 func (m *Quantity) String() string { return proto.CompactTextString(m) }
 func (*Quantity) ProtoMessage()    {}
 func (*Quantity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{14}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{14}
 }
 func (m *Quantity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Quantity.Unmarshal(m, b)
@@ -977,7 +986,7 @@ func (m *AllocationAsk) Reset()         { *m = AllocationAsk{} }
 func (m *AllocationAsk) String() string { return proto.CompactTextString(m) }
 func (*AllocationAsk) ProtoMessage()    {}
 func (*AllocationAsk) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{15}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{15}
 }
 func (m *AllocationAsk) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AllocationAsk.Unmarshal(m, b)
@@ -1105,7 +1114,7 @@ func (m *AddApplicationRequest) Reset()         { *m = AddApplicationRequest{} }
 func (m *AddApplicationRequest) String() string { return proto.CompactTextString(m) }
 func (*AddApplicationRequest) ProtoMessage()    {}
 func (*AddApplicationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{16}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{16}
 }
 func (m *AddApplicationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddApplicationRequest.Unmarshal(m, b)
@@ -1195,7 +1204,7 @@ func (m *RemoveApplicationRequest) Reset()         { *m = RemoveApplicationReque
 func (m *RemoveApplicationRequest) String() string { return proto.CompactTextString(m) }
 func (*RemoveApplicationRequest) ProtoMessage()    {}
 func (*RemoveApplicationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{17}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{17}
 }
 func (m *RemoveApplicationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RemoveApplicationRequest.Unmarshal(m, b)
@@ -1243,7 +1252,7 @@ func (m *UserGroupInformation) Reset()         { *m = UserGroupInformation{} }
 func (m *UserGroupInformation) String() string { return proto.CompactTextString(m) }
 func (*UserGroupInformation) ProtoMessage()    {}
 func (*UserGroupInformation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{18}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{18}
 }
 func (m *UserGroupInformation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserGroupInformation.Unmarshal(m, b)
@@ -1308,7 +1317,7 @@ func (m *Allocation) Reset()         { *m = Allocation{} }
 func (m *Allocation) String() string { return proto.CompactTextString(m) }
 func (*Allocation) ProtoMessage()    {}
 func (*Allocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{19}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{19}
 }
 func (m *Allocation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Allocation.Unmarshal(m, b)
@@ -1412,7 +1421,7 @@ func (m *AllocationReleasesRequest) Reset()         { *m = AllocationReleasesReq
 func (m *AllocationReleasesRequest) String() string { return proto.CompactTextString(m) }
 func (*AllocationReleasesRequest) ProtoMessage()    {}
 func (*AllocationReleasesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{20}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{20}
 }
 func (m *AllocationReleasesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AllocationReleasesRequest.Unmarshal(m, b)
@@ -1472,7 +1481,7 @@ func (m *AllocationRelease) Reset()         { *m = AllocationRelease{} }
 func (m *AllocationRelease) String() string { return proto.CompactTextString(m) }
 func (*AllocationRelease) ProtoMessage()    {}
 func (*AllocationRelease) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{21}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{21}
 }
 func (m *AllocationRelease) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AllocationRelease.Unmarshal(m, b)
@@ -1556,7 +1565,7 @@ func (m *AllocationAskRelease) Reset()         { *m = AllocationAskRelease{} }
 func (m *AllocationAskRelease) String() string { return proto.CompactTextString(m) }
 func (*AllocationAskRelease) ProtoMessage()    {}
 func (*AllocationAskRelease) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{22}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{22}
 }
 func (m *AllocationAskRelease) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AllocationAskRelease.Unmarshal(m, b)
@@ -1635,7 +1644,7 @@ func (m *NodeInfo) Reset()         { *m = NodeInfo{} }
 func (m *NodeInfo) String() string { return proto.CompactTextString(m) }
 func (*NodeInfo) ProtoMessage()    {}
 func (*NodeInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{23}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{23}
 }
 func (m *NodeInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodeInfo.Unmarshal(m, b)
@@ -1712,7 +1721,7 @@ func (m *RejectedAllocationAsk) Reset()         { *m = RejectedAllocationAsk{} }
 func (m *RejectedAllocationAsk) String() string { return proto.CompactTextString(m) }
 func (*RejectedAllocationAsk) ProtoMessage()    {}
 func (*RejectedAllocationAsk) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{24}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{24}
 }
 func (m *RejectedAllocationAsk) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RejectedAllocationAsk.Unmarshal(m, b)
@@ -1770,7 +1779,7 @@ func (m *PredicatesArgs) Reset()         { *m = PredicatesArgs{} }
 func (m *PredicatesArgs) String() string { return proto.CompactTextString(m) }
 func (*PredicatesArgs) ProtoMessage()    {}
 func (*PredicatesArgs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{25}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{25}
 }
 func (m *PredicatesArgs) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PredicatesArgs.Unmarshal(m, b)
@@ -1829,7 +1838,7 @@ func (m *UpdateContainerSchedulingStateRequest) Reset()         { *m = UpdateCon
 func (m *UpdateContainerSchedulingStateRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateContainerSchedulingStateRequest) ProtoMessage()    {}
 func (*UpdateContainerSchedulingStateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{26}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{26}
 }
 func (m *UpdateContainerSchedulingStateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateContainerSchedulingStateRequest.Unmarshal(m, b)
@@ -1883,17 +1892,19 @@ type UpdateConfigurationRequest struct {
 	// PolicyGroup to update
 	PolicyGroup string `protobuf:"bytes,3,opt,name=policyGroup,proto3" json:"policyGroup,omitempty"`
 	// New configuration to update
-	Config               string   `protobuf:"bytes,4,opt,name=config,proto3" json:"config,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Config string `protobuf:"bytes,4,opt,name=config,proto3" json:"config,omitempty"`
+	// Additional configuration key/value pairs for configuration not related to the policyGroup.
+	ExtraConfig          map[string]string `protobuf:"bytes,5,rep,name=extraConfig,proto3" json:"extraConfig,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
 func (m *UpdateConfigurationRequest) Reset()         { *m = UpdateConfigurationRequest{} }
 func (m *UpdateConfigurationRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateConfigurationRequest) ProtoMessage()    {}
 func (*UpdateConfigurationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{27}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{27}
 }
 func (m *UpdateConfigurationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateConfigurationRequest.Unmarshal(m, b)
@@ -1934,6 +1945,13 @@ func (m *UpdateConfigurationRequest) GetConfig() string {
 	return ""
 }
 
+func (m *UpdateConfigurationRequest) GetExtraConfig() map[string]string {
+	if m != nil {
+		return m.ExtraConfig
+	}
+	return nil
+}
+
 type EventRecord struct {
 	// the type of the object associated with the event
 	Type EventRecord_Type `protobuf:"varint,1,opt,name=type,proto3,enum=si.v1.EventRecord_Type" json:"type,omitempty"`
@@ -1957,7 +1975,7 @@ func (m *EventRecord) Reset()         { *m = EventRecord{} }
 func (m *EventRecord) String() string { return proto.CompactTextString(m) }
 func (*EventRecord) ProtoMessage()    {}
 func (*EventRecord) Descriptor() ([]byte, []int) {
-	return fileDescriptor_si_892602ea943a6bbd, []int{28}
+	return fileDescriptor_si_c95768ecb52ed7aa, []int{28}
 }
 func (m *EventRecord) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EventRecord.Unmarshal(m, b)
@@ -2031,6 +2049,7 @@ var E_SiSecret = &proto.ExtensionDesc{
 func init() {
 	proto.RegisterType((*RegisterResourceManagerRequest)(nil), "si.v1.RegisterResourceManagerRequest")
 	proto.RegisterMapType((map[string]string)(nil), "si.v1.RegisterResourceManagerRequest.BuildInfoEntry")
+	proto.RegisterMapType((map[string]string)(nil), "si.v1.RegisterResourceManagerRequest.ExtraConfigEntry")
 	proto.RegisterType((*RegisterResourceManagerResponse)(nil), "si.v1.RegisterResourceManagerResponse")
 	proto.RegisterType((*AllocationRequest)(nil), "si.v1.AllocationRequest")
 	proto.RegisterType((*ApplicationRequest)(nil), "si.v1.ApplicationRequest")
@@ -2063,6 +2082,7 @@ func init() {
 	proto.RegisterType((*PredicatesArgs)(nil), "si.v1.PredicatesArgs")
 	proto.RegisterType((*UpdateContainerSchedulingStateRequest)(nil), "si.v1.UpdateContainerSchedulingStateRequest")
 	proto.RegisterType((*UpdateConfigurationRequest)(nil), "si.v1.UpdateConfigurationRequest")
+	proto.RegisterMapType((map[string]string)(nil), "si.v1.UpdateConfigurationRequest.ExtraConfigEntry")
 	proto.RegisterType((*EventRecord)(nil), "si.v1.EventRecord")
 	proto.RegisterEnum("si.v1.TerminationType", TerminationType_name, TerminationType_value)
 	proto.RegisterEnum("si.v1.NodeInfo_ActionFromRM", NodeInfo_ActionFromRM_name, NodeInfo_ActionFromRM_value)
@@ -2356,138 +2376,141 @@ var _Scheduler_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("yunikorn-scheduler-interface/si.proto", fileDescriptor_si_892602ea943a6bbd)
-}
-
-var fileDescriptor_si_892602ea943a6bbd = []byte{
-	// 2049 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0x4f, 0x73, 0xdb, 0xb8,
-	0x15, 0x0f, 0x25, 0xd9, 0x96, 0x9e, 0x6c, 0x99, 0x81, 0xbc, 0x09, 0xa3, 0xba, 0x89, 0xcb, 0xae,
-	0x3d, 0x9e, 0x76, 0x22, 0xef, 0x7a, 0x33, 0xcd, 0x4e, 0x92, 0x76, 0x2b, 0x5b, 0xcc, 0x46, 0x1b,
-	0xeb, 0x4f, 0x28, 0x69, 0x3b, 0xdb, 0x8b, 0x86, 0x96, 0x60, 0x2e, 0x63, 0x89, 0xd4, 0x02, 0xa4,
-	0x1b, 0x4f, 0xa7, 0xc7, 0x9e, 0x3b, 0x7b, 0xea, 0xb4, 0xd3, 0x5b, 0x67, 0xfa, 0x21, 0x7a, 0xea,
-	0xb1, 0x1f, 0xa0, 0xfd, 0x06, 0x3d, 0xf5, 0xd0, 0x5b, 0xef, 0x1d, 0x80, 0xe0, 0x3f, 0x91, 0x72,
-	0x94, 0x4e, 0xf6, 0x46, 0x3c, 0xfc, 0x1e, 0xf0, 0xf0, 0xde, 0xc3, 0x0f, 0x0f, 0x20, 0xec, 0x5f,
-	0x7b, 0xb6, 0x75, 0xe9, 0x10, 0xfb, 0x21, 0x1d, 0x7f, 0x8d, 0x27, 0xde, 0x14, 0x93, 0x87, 0x96,
-	0xed, 0x62, 0x72, 0x61, 0x8c, 0xf1, 0x11, 0xb5, 0xea, 0x73, 0xe2, 0xb8, 0x0e, 0x5a, 0xa3, 0x56,
-	0xfd, 0xea, 0xe3, 0xda, 0x9e, 0xe9, 0x38, 0xe6, 0x14, 0x1f, 0x71, 0xe1, 0xb9, 0x77, 0x71, 0x34,
-	0xc1, 0x74, 0x4c, 0xac, 0xb9, 0xeb, 0x10, 0x1f, 0xa8, 0xfe, 0x31, 0x07, 0xf7, 0x75, 0x6c, 0x5a,
-	0xd4, 0xc5, 0x44, 0xc7, 0xd4, 0xf1, 0xc8, 0x18, 0xb7, 0x0d, 0xdb, 0x30, 0x59, 0xf3, 0x1b, 0x0f,
-	0x53, 0x17, 0x21, 0x28, 0x90, 0x59, 0xab, 0xa9, 0x48, 0x7b, 0xd2, 0x61, 0x49, 0xe7, 0xdf, 0x48,
-	0x81, 0x8d, 0x2b, 0x4c, 0xa8, 0xe5, 0xd8, 0x4a, 0x8e, 0x8b, 0x83, 0x26, 0xda, 0x83, 0xf2, 0xdc,
-	0x99, 0x5a, 0xe3, 0xeb, 0xcf, 0x89, 0xe3, 0xcd, 0x95, 0x3c, 0xef, 0x8d, 0x8b, 0x90, 0x0e, 0xa5,
-	0x73, 0xcf, 0x9a, 0x4e, 0x5a, 0xf6, 0x85, 0xa3, 0x14, 0xf6, 0xf2, 0x87, 0xe5, 0xe3, 0x47, 0x75,
-	0x6e, 0x6f, 0xfd, 0x66, 0x4b, 0xea, 0x27, 0x81, 0x9a, 0x66, 0xbb, 0xe4, 0x5a, 0x8f, 0x86, 0x41,
-	0x77, 0x60, 0x7d, 0xec, 0xd8, 0x17, 0x96, 0xa9, 0xac, 0xf1, 0x09, 0x45, 0xab, 0xf6, 0x0c, 0x2a,
-	0x49, 0x25, 0x24, 0x43, 0xfe, 0x12, 0x5f, 0x8b, 0xc5, 0xb0, 0x4f, 0xb4, 0x03, 0x6b, 0x57, 0xc6,
-	0xd4, 0xc3, 0x62, 0x25, 0x7e, 0xe3, 0x49, 0xee, 0x53, 0x49, 0xfd, 0x01, 0x3c, 0x58, 0x6a, 0x11,
-	0x9d, 0x3b, 0x36, 0xc5, 0xea, 0xef, 0x24, 0xb8, 0xdd, 0x98, 0x4e, 0x9d, 0xb1, 0xe1, 0x5a, 0x8e,
-	0x1d, 0xb8, 0xec, 0x10, 0x0a, 0x06, 0xbd, 0xa4, 0x8a, 0xc4, 0x57, 0xb7, 0x23, 0x56, 0x17, 0xe1,
-	0x1a, 0xf4, 0x52, 0xe7, 0x08, 0xf4, 0x0c, 0x8a, 0x04, 0x4f, 0xb1, 0x41, 0x31, 0xe5, 0xf3, 0x97,
-	0x8f, 0xf7, 0x52, 0x68, 0x5d, 0x00, 0xc4, 0xe8, 0x7a, 0xa8, 0x11, 0x86, 0x26, 0x1f, 0x85, 0x46,
-	0xfd, 0x56, 0x02, 0xd4, 0x98, 0xcf, 0xa7, 0x56, 0xd2, 0xa4, 0x3a, 0xe4, 0x6d, 0xfc, 0x2b, 0x61,
-	0xd1, 0x6e, 0x30, 0xc7, 0x64, 0x92, 0x86, 0xea, 0x0c, 0x88, 0x1e, 0xc3, 0x3a, 0xc1, 0x33, 0xe7,
-	0x8a, 0xb9, 0x85, 0xa9, 0x3c, 0x08, 0x43, 0xc4, 0x84, 0x19, 0x5a, 0x02, 0x9e, 0x69, 0xd3, 0x0b,
-	0x28, 0x77, 0x9c, 0x09, 0x0e, 0x6c, 0xd9, 0x87, 0x35, 0xdb, 0x99, 0xe0, 0xc0, 0x3f, 0xdb, 0x62,
-	0x68, 0x06, 0x61, 0x81, 0xd2, 0xfd, 0xde, 0x70, 0xa4, 0x5c, 0x6c, 0xa4, 0x7f, 0xb3, 0xd5, 0xc5,
-	0x3c, 0xe3, 0x87, 0x01, 0xfd, 0x30, 0xbe, 0xba, 0xdb, 0x69, 0x0f, 0xf2, 0x25, 0x3d, 0x0a, 0x7d,
-	0x3d, 0x11, 0x8b, 0x52, 0x96, 0xf9, 0x3a, 0xf4, 0xf1, 0x04, 0x7d, 0x06, 0x9b, 0xc1, 0x77, 0x83,
-	0xc5, 0x34, 0xcf, 0x35, 0xbf, 0x97, 0x19, 0x53, 0xa1, 0x9c, 0x50, 0x40, 0x9f, 0xb2, 0x69, 0x5f,
-	0xe3, 0xb1, 0x8b, 0x27, 0x22, 0xdd, 0x77, 0x43, 0x5f, 0xfa, 0xe2, 0xe4, 0x20, 0x21, 0x5a, 0xfd,
-	0xab, 0x04, 0xd5, 0x84, 0xa7, 0xc5, 0x6a, 0x7f, 0x12, 0x1b, 0xd1, 0x5f, 0x72, 0x6d, 0x71, 0xc4,
-	0x98, 0x56, 0x88, 0x65, 0x7a, 0xc6, 0x78, 0x8c, 0xe7, 0x6e, 0xe8, 0x80, 0x40, 0xaf, 0x21, 0xc4,
-	0x09, 0xbd, 0x00, 0x8b, 0x3e, 0x81, 0x0d, 0x6f, 0x3e, 0x31, 0x98, 0x9a, 0xbf, 0xfa, 0x7b, 0x42,
-	0x6d, 0xe8, 0x4b, 0xe3, 0x5a, 0x01, 0x52, 0x9d, 0xc3, 0xa6, 0x1f, 0x73, 0x61, 0xf4, 0x51, 0xca,
-	0xe8, 0xea, 0x82, 0xd1, 0x1c, 0x1e, 0x59, 0x7b, 0x94, 0xb2, 0xb6, 0xba, 0x60, 0xad, 0xaf, 0x10,
-	0x80, 0xd4, 0xbf, 0x48, 0x80, 0xd2, 0x16, 0xa1, 0x0f, 0x61, 0xcb, 0x88, 0x9a, 0x21, 0x91, 0x25,
-	0x85, 0x8c, 0x05, 0xa8, 0x6b, 0xb8, 0x21, 0x0b, 0xf0, 0x06, 0x7a, 0x02, 0x0a, 0xff, 0x18, 0x10,
-	0xc3, 0xa6, 0x16, 0x83, 0x0e, 0xac, 0x19, 0xa6, 0xae, 0x31, 0xf3, 0xa9, 0x2d, 0xaf, 0x2f, 0xed,
-	0x67, 0x1c, 0x39, 0xc3, 0x94, 0x1a, 0x26, 0x56, 0x0a, 0x3e, 0x47, 0x8a, 0xa6, 0xda, 0x87, 0x6a,
-	0x46, 0xa0, 0x56, 0x34, 0xf4, 0x0e, 0xdb, 0x98, 0x06, 0x0d, 0x99, 0x57, 0xb4, 0xd4, 0xa7, 0x50,
-	0xcd, 0x88, 0xe2, 0x6a, 0x83, 0xaa, 0x3f, 0x83, 0xcd, 0x78, 0x14, 0xd8, 0x24, 0x6c, 0x0f, 0x86,
-	0x70, 0xd1, 0x5a, 0x3a, 0xf9, 0x01, 0x6c, 0xc6, 0x83, 0xb2, 0x4c, 0x5f, 0xfd, 0xbd, 0x04, 0xc5,
-	0x80, 0x4a, 0xd1, 0x33, 0x28, 0x11, 0xf1, 0x1d, 0x50, 0xc1, 0xfd, 0x30, 0x25, 0x7c, 0x79, 0xf8,
-	0x41, 0x05, 0xe5, 0x87, 0x0a, 0xb5, 0x36, 0x54, 0x92, 0x9d, 0x19, 0xd4, 0xbe, 0x1f, 0xa7, 0xf6,
-	0x88, 0x68, 0x5e, 0x79, 0x86, 0xed, 0x5a, 0xee, 0x75, 0x9c, 0xeb, 0xf7, 0xa0, 0x18, 0x88, 0xa3,
-	0x13, 0x41, 0xe2, 0x21, 0xf6, 0x1b, 0xea, 0xb7, 0x05, 0xd8, 0x4a, 0xec, 0x54, 0xee, 0xdb, 0x50,
-	0xf0, 0x32, 0x9c, 0x3a, 0x29, 0x4c, 0x47, 0x20, 0x97, 0x15, 0xd6, 0x0f, 0x61, 0x6b, 0x6e, 0x10,
-	0x97, 0xe7, 0x50, 0xc7, 0x98, 0x61, 0xc1, 0x9f, 0x49, 0x21, 0xfa, 0x18, 0xca, 0x81, 0x07, 0x1a,
-	0xf4, 0x92, 0xe7, 0x55, 0xb4, 0xac, 0xc0, 0x1d, 0x7a, 0x1c, 0x83, 0x0e, 0xa0, 0x32, 0x33, 0xde,
-	0x44, 0x86, 0x53, 0x7e, 0x44, 0xae, 0xe9, 0x0b, 0x52, 0x54, 0x83, 0xe2, 0x9c, 0x58, 0x0e, 0xb1,
-	0xdc, 0x6b, 0x65, 0x9d, 0x23, 0xc2, 0x36, 0x3a, 0x81, 0x5d, 0xfc, 0x06, 0x8f, 0xbd, 0x20, 0xc1,
-	0x1d, 0xcf, 0x6d, 0x5b, 0xd3, 0xa9, 0xd5, 0xc7, 0x63, 0xc7, 0x9e, 0x50, 0x65, 0x83, 0xfb, 0xe9,
-	0x46, 0x0c, 0x3a, 0x86, 0x82, 0x6b, 0x98, 0x54, 0x29, 0x26, 0x02, 0x9d, 0x70, 0x68, 0x7d, 0x60,
-	0x98, 0x22, 0xd0, 0x1c, 0xcb, 0x9c, 0xe2, 0x1a, 0xf4, 0x92, 0xd7, 0x0d, 0xdc, 0x29, 0x25, 0xdf,
-	0x29, 0x09, 0x21, 0x2f, 0x39, 0xa6, 0xc6, 0x18, 0x7f, 0xed, 0x4c, 0x27, 0x98, 0x28, 0xb0, 0x27,
-	0x1d, 0x16, 0xf5, 0xb8, 0x08, 0xdd, 0x07, 0xe8, 0x12, 0xcb, 0xb4, 0x6c, 0xc3, 0x75, 0x88, 0x52,
-	0xe6, 0x80, 0x98, 0xa4, 0xf6, 0x18, 0x4a, 0xe1, 0xd4, 0xef, 0x54, 0x21, 0xfc, 0x23, 0x0f, 0x1f,
-	0x64, 0x1e, 0xa2, 0x2b, 0x6e, 0xe6, 0x5d, 0x28, 0x7d, 0xe3, 0x61, 0x0f, 0xf3, 0xc5, 0xf9, 0xa3,
-	0x47, 0x82, 0x15, 0x73, 0xe2, 0x21, 0xe4, 0x3d, 0xd3, 0x12, 0xb9, 0x10, 0x9c, 0x4b, 0x43, 0x8a,
-	0x09, 0xf7, 0x10, 0x3b, 0x50, 0xc9, 0x4c, 0x9c, 0x82, 0x9e, 0x69, 0xa1, 0x27, 0x22, 0x0e, 0x6b,
-	0x3c, 0x0e, 0x07, 0x37, 0x55, 0x02, 0xa9, 0x78, 0xbc, 0x2d, 0x0f, 0xd6, 0x57, 0xc8, 0x83, 0xc7,
-	0x50, 0x89, 0x85, 0x86, 0x65, 0xf1, 0x46, 0x76, 0x16, 0x2f, 0xc0, 0xd0, 0x47, 0x50, 0x35, 0x0d,
-	0xdb, 0xec, 0xfb, 0x75, 0xaf, 0x65, 0x9b, 0x7d, 0xf7, 0x7a, 0x8a, 0x95, 0x22, 0xf7, 0x49, 0x56,
-	0xd7, 0xff, 0x1f, 0xd6, 0x0b, 0x50, 0x96, 0xd5, 0x39, 0x2b, 0x06, 0x36, 0x15, 0xba, 0x5c, 0x46,
-	0xe8, 0xd4, 0x13, 0xd8, 0xc9, 0x0a, 0x14, 0xab, 0x7c, 0x3c, 0x8a, 0x49, 0x50, 0x72, 0xb3, 0x6f,
-	0x46, 0xa9, 0x26, 0xc3, 0x51, 0x7e, 0x18, 0x96, 0x74, 0xd1, 0x52, 0xff, 0x93, 0x07, 0x88, 0x76,
-	0xd1, 0x8a, 0x9c, 0xd4, 0x86, 0x4a, 0x24, 0x60, 0x3e, 0x12, 0x27, 0xec, 0x7e, 0x6a, 0x5b, 0xc6,
-	0x3e, 0xa3, 0x6c, 0x58, 0x50, 0x66, 0xf6, 0x0e, 0x87, 0x51, 0xcd, 0xc7, 0xbe, 0xd1, 0x53, 0x90,
-	0x03, 0x1a, 0xea, 0x61, 0xc2, 0x47, 0xe1, 0xcc, 0x93, 0x11, 0xe9, 0x14, 0xf0, 0x46, 0x32, 0x8a,
-	0xce, 0x96, 0x62, 0xe2, 0x6c, 0x4a, 0x05, 0xa6, 0xb4, 0x52, 0x60, 0x20, 0x6b, 0x4f, 0xa5, 0x88,
-	0xa7, 0xbc, 0x02, 0xf1, 0x6c, 0xa6, 0x88, 0xa7, 0xd6, 0x80, 0x6a, 0x86, 0xff, 0xde, 0x25, 0x17,
-	0xbf, 0x28, 0x14, 0x37, 0xe4, 0x62, 0x8c, 0x15, 0xd4, 0xbf, 0x49, 0x70, 0x6f, 0xe9, 0xe5, 0x00,
-	0x9d, 0xc1, 0x4e, 0x14, 0x1c, 0x3a, 0x70, 0x44, 0xbf, 0x38, 0x5f, 0x97, 0x17, 0xbc, 0x99, 0x5a,
-	0x68, 0x08, 0x77, 0x8d, 0x38, 0x43, 0xc7, 0x06, 0xcc, 0xbd, 0xbd, 0x0e, 0x5e, 0xa6, 0xab, 0xfe,
-	0x77, 0xe1, 0xd6, 0xe4, 0x4f, 0x96, 0x0a, 0x8d, 0xb4, 0x24, 0x34, 0x2b, 0x1c, 0xa7, 0x59, 0x19,
-	0xf9, 0x73, 0xd8, 0x76, 0x31, 0x99, 0x31, 0xce, 0x67, 0xd1, 0xb8, 0x9e, 0xfb, 0x85, 0x59, 0xe5,
-	0xf8, 0x8e, 0x58, 0xc4, 0x20, 0xd9, 0xab, 0x2f, 0xc2, 0xe3, 0x25, 0xdd, 0x5a, 0xa2, 0xa4, 0x4b,
-	0x6f, 0xbb, 0xf5, 0x8c, 0x6d, 0xa7, 0xfe, 0x4b, 0x82, 0x9d, 0x2c, 0x4f, 0xbd, 0xd7, 0xa5, 0xa7,
-	0x4c, 0xc9, 0x67, 0x31, 0xc0, 0x77, 0xe8, 0x0c, 0xf5, 0x4f, 0x05, 0x28, 0x06, 0x97, 0xb9, 0xa5,
-	0xa5, 0xe4, 0x23, 0x58, 0x37, 0xc6, 0x6e, 0xf0, 0x82, 0x50, 0x09, 0x2f, 0x45, 0x81, 0x62, 0xbd,
-	0xc1, 0x7b, 0x9f, 0x13, 0x67, 0xa6, 0xb7, 0x75, 0x81, 0x45, 0x9f, 0x01, 0x18, 0xae, 0x4b, 0xac,
-	0x73, 0xcf, 0xc5, 0xc1, 0x5d, 0xec, 0x41, 0x4a, 0x33, 0x44, 0xf8, 0x74, 0x15, 0x53, 0x41, 0x0d,
-	0xa8, 0x8a, 0x97, 0x13, 0xe3, 0x7c, 0x8a, 0x03, 0x0a, 0x5a, 0x56, 0x49, 0x65, 0x61, 0x19, 0xb3,
-	0x39, 0xe3, 0xb1, 0x37, 0xb7, 0xf0, 0x24, 0xd4, 0x5f, 0xc6, 0x6c, 0x8b, 0x40, 0x74, 0x0a, 0x55,
-	0xfc, 0xc6, 0xa2, 0xae, 0x65, 0x9b, 0xf1, 0x9a, 0x6c, 0x7d, 0xd9, 0xcd, 0x35, 0x0b, 0x5d, 0xfb,
-	0x29, 0x6c, 0x2f, 0xac, 0xf1, 0x9d, 0x8e, 0xb7, 0xdf, 0xb0, 0x6a, 0x3d, 0x72, 0x2e, 0xaa, 0xc1,
-	0x9d, 0x61, 0xe7, 0x65, 0xa7, 0xfb, 0x8b, 0xce, 0xa8, 0x71, 0x3a, 0x68, 0x75, 0x3b, 0xa3, 0xe7,
-	0x7a, 0xb7, 0x3d, 0xd2, 0xdb, 0xf2, 0x2d, 0x04, 0xb0, 0x7e, 0xaa, 0x6b, 0x8d, 0x81, 0x26, 0x4b,
-	0xec, 0x7b, 0xd8, 0x6b, 0xb2, 0xef, 0x1c, 0xaa, 0x00, 0x34, 0xf5, 0x46, 0xab, 0x33, 0xea, 0x74,
-	0x9b, 0x9a, 0x9c, 0x47, 0xdb, 0x50, 0x6e, 0x6a, 0xa7, 0xdd, 0x76, 0xab, 0xdf, 0x6f, 0x75, 0x3b,
-	0x72, 0x01, 0x29, 0xb0, 0xe3, 0x03, 0x06, 0xdd, 0x51, 0xff, 0xf4, 0x85, 0xd6, 0x1c, 0x9e, 0x35,
-	0x4e, 0xce, 0x34, 0x79, 0x4d, 0xfd, 0x35, 0x7c, 0x90, 0x79, 0xf3, 0x7d, 0xaf, 0xf5, 0x74, 0x74,
-	0x53, 0xc9, 0x27, 0x6e, 0x2a, 0xaf, 0xa1, 0xd2, 0x23, 0x78, 0xc2, 0x80, 0x98, 0x36, 0x88, 0x5f,
-	0x64, 0xae, 0x30, 0x6b, 0x94, 0xc6, 0xb9, 0x44, 0x1a, 0xd7, 0xa0, 0x28, 0x80, 0x7e, 0x79, 0x56,
-	0xd4, 0xc3, 0xb6, 0xfa, 0xf7, 0x1c, 0xec, 0xfb, 0x17, 0xd2, 0x53, 0xc7, 0x76, 0x0d, 0xcb, 0xc6,
-	0x24, 0x5e, 0xa2, 0x18, 0x6e, 0xf8, 0x22, 0x72, 0x00, 0x15, 0x61, 0x3e, 0x49, 0x54, 0x15, 0x0b,
-	0xd2, 0xb4, 0xad, 0xb9, 0x2c, 0x5b, 0xf5, 0xe0, 0x2e, 0x9b, 0xe7, 0x3b, 0xeb, 0x59, 0xe2, 0xb6,
-	0xfe, 0x16, 0x53, 0xea, 0x8b, 0x62, 0x71, 0x13, 0x8e, 0xfc, 0x59, 0x48, 0xf8, 0x13, 0xc3, 0xf6,
-	0x82, 0x06, 0xda, 0x05, 0x25, 0x48, 0x27, 0x11, 0xf8, 0x56, 0xe7, 0xf3, 0x51, 0x7f, 0xc0, 0x12,
-	0xe7, 0x16, 0x2a, 0xc3, 0x46, 0xff, 0x65, 0xab, 0xd7, 0xd3, 0x9a, 0xb2, 0x84, 0xb6, 0xa0, 0x24,
-	0x20, 0x5a, 0x53, 0xce, 0xa1, 0x4d, 0x28, 0xea, 0x5a, 0x5f, 0xd3, 0xbf, 0xd4, 0x9a, 0x72, 0x9e,
-	0xa5, 0xdb, 0xf3, 0x46, 0x8b, 0xf5, 0x14, 0xd4, 0x6b, 0xa8, 0x85, 0xe6, 0x5f, 0x58, 0xa6, 0x47,
-	0x12, 0x35, 0x59, 0xc6, 0x4b, 0xd1, 0x0a, 0x0f, 0x91, 0xd1, 0xa3, 0x61, 0x21, 0xfe, 0x68, 0xf8,
-	0x45, 0xa1, 0x28, 0xc9, 0x39, 0x7d, 0xc3, 0x6f, 0x51, 0xf5, 0x0f, 0x39, 0x28, 0x6b, 0x57, 0xd8,
-	0x76, 0x75, 0x3c, 0x76, 0xc8, 0x04, 0xfd, 0x18, 0x0a, 0x2e, 0xa3, 0x4b, 0x89, 0x3b, 0xf7, 0xae,
-	0x70, 0x6e, 0x0c, 0x51, 0xe7, 0x7c, 0xc9, 0x41, 0x2c, 0x3d, 0x9c, 0x73, 0x96, 0xeb, 0xa1, 0x75,
-	0x61, 0x9b, 0x11, 0x28, 0xaf, 0xe1, 0xc2, 0x63, 0x2a, 0x68, 0x2e, 0x73, 0xf6, 0xcd, 0xe7, 0x8f,
-	0x1b, 0xbc, 0x3c, 0x74, 0x0c, 0xdb, 0x11, 0xa5, 0x78, 0x52, 0xa8, 0x76, 0xa1, 0xc0, 0xa9, 0x3b,
-	0x16, 0x21, 0xed, 0x4b, 0xad, 0x33, 0xd0, 0xb5, 0xd3, 0xae, 0xde, 0x1c, 0x0d, 0xbe, 0xea, 0x89,
-	0x08, 0xe9, 0xda, 0xab, 0xa1, 0xd6, 0x1f, 0xc8, 0x12, 0xda, 0x80, 0x7c, 0xa3, 0xd7, 0x93, 0x73,
-	0xa8, 0x08, 0x05, 0xb1, 0xd5, 0x4b, 0xb0, 0xf6, 0x6a, 0xa8, 0x0d, 0x35, 0xb9, 0xf0, 0xa3, 0xdf,
-	0x4a, 0xb0, 0xbd, 0x70, 0x50, 0xc4, 0x07, 0x1f, 0x68, 0x7a, 0xbb, 0xd5, 0x69, 0x70, 0x4a, 0x11,
-	0x83, 0xdf, 0x86, 0xad, 0xfe, 0xa0, 0xcb, 0xc2, 0x3f, 0x3a, 0xf9, 0x8a, 0x51, 0x8c, 0xc4, 0xe6,
-	0x1b, 0xb4, 0xda, 0x5a, 0x77, 0x38, 0x90, 0x73, 0x8c, 0x8b, 0x7a, 0xba, 0xa6, 0xb5, 0x7b, 0x03,
-	0x1f, 0x11, 0xa4, 0x87, 0x2e, 0xe7, 0x19, 0xa5, 0xf4, 0xce, 0x1a, 0xa7, 0xda, 0x8b, 0xee, 0x59,
-	0x53, 0xd3, 0x47, 0xba, 0xc6, 0x5b, 0x4d, 0xb9, 0x70, 0xfc, 0xcf, 0x1c, 0x94, 0xfa, 0xc1, 0x83,
-	0x38, 0x7a, 0x0d, 0x77, 0x97, 0xbc, 0xdb, 0xa2, 0xfd, 0x95, 0x5e, 0x9a, 0x6b, 0x07, 0x6f, 0x83,
-	0x89, 0xe7, 0xdf, 0x5b, 0xa8, 0x0d, 0xb2, 0x9f, 0x98, 0xb1, 0x1a, 0x3c, 0xab, 0xca, 0xf2, 0xc7,
-	0xbd, 0x97, 0xd1, 0x13, 0x0c, 0x75, 0x28, 0x7d, 0x24, 0xa1, 0x1e, 0xdc, 0x16, 0xc3, 0xc5, 0xde,
-	0x70, 0x42, 0xad, 0xd4, 0x6d, 0xa4, 0x56, 0xcb, 0xea, 0x4a, 0x8c, 0xf8, 0x14, 0xc0, 0x1f, 0x91,
-	0x3f, 0xcc, 0xa0, 0xd8, 0x59, 0x19, 0x8c, 0x51, 0x4d, 0xc8, 0xe2, 0xca, 0x4f, 0x9e, 0x42, 0x89,
-	0x5a, 0x23, 0x8a, 0xc7, 0x04, 0xbb, 0xe8, 0xfb, 0x75, 0xff, 0x77, 0x42, 0x3d, 0xf8, 0x9d, 0x50,
-	0x7f, 0x6e, 0xe1, 0xe9, 0xa4, 0x3b, 0xf7, 0x8f, 0xb0, 0x3f, 0x17, 0x7d, 0xfa, 0xa3, 0xec, 0xaa,
-	0x47, 0xb0, 0x7b, 0x52, 0xfe, 0x65, 0x69, 0x6a, 0x9d, 0x1f, 0x99, 0xce, 0x11, 0xb5, 0xce, 0xd7,
-	0xb9, 0xd2, 0x27, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x5c, 0x41, 0x11, 0xf9, 0xc1, 0x18, 0x00,
-	0x00,
+	proto.RegisterFile("yunikorn-scheduler-interface/si.proto", fileDescriptor_si_c95768ecb52ed7aa)
+}
+
+var fileDescriptor_si_c95768ecb52ed7aa = []byte{
+	// 2104 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0x4f, 0x73, 0xdb, 0xc6,
+	0x15, 0x37, 0x48, 0x8a, 0x22, 0x1f, 0x25, 0x0a, 0x5e, 0x2a, 0x36, 0xcc, 0xaa, 0xb6, 0x8a, 0x46,
+	0x1a, 0x4d, 0x3b, 0xa6, 0x12, 0xc5, 0x13, 0x67, 0x6c, 0x37, 0x29, 0x25, 0xc2, 0x31, 0x63, 0xf1,
+	0x8f, 0x41, 0x32, 0x6d, 0x7a, 0xe1, 0x40, 0xe4, 0x8a, 0x81, 0x45, 0x02, 0xcc, 0x2e, 0xa0, 0x5a,
+	0xd3, 0xe9, 0xb1, 0xe7, 0x4c, 0x4e, 0x9d, 0xce, 0xf4, 0xd6, 0x99, 0x7e, 0x82, 0x9e, 0x7a, 0xea,
+	0xb1, 0x1f, 0xa0, 0xfd, 0x06, 0x3d, 0xf5, 0xd0, 0x5b, 0xef, 0x9d, 0x5d, 0x2c, 0xfe, 0x11, 0xa0,
+	0x44, 0xb7, 0xee, 0x0d, 0xfb, 0xf6, 0xf7, 0xde, 0xbe, 0x7d, 0xef, 0xed, 0x7b, 0x6f, 0x17, 0xb0,
+	0x77, 0xe5, 0x5a, 0xe6, 0x85, 0x4d, 0xac, 0x87, 0x74, 0xf4, 0x35, 0x1e, 0xbb, 0x53, 0x4c, 0x1e,
+	0x9a, 0x96, 0x83, 0xc9, 0xb9, 0x31, 0xc2, 0x87, 0xd4, 0xac, 0xcd, 0x89, 0xed, 0xd8, 0x68, 0x8d,
+	0x9a, 0xb5, 0xcb, 0x0f, 0xab, 0xbb, 0x13, 0xdb, 0x9e, 0x4c, 0xf1, 0x21, 0x27, 0x9e, 0xb9, 0xe7,
+	0x87, 0x63, 0x4c, 0x47, 0xc4, 0x9c, 0x3b, 0x36, 0xf1, 0x80, 0xea, 0x9f, 0xb2, 0x70, 0x5f, 0xc7,
+	0x13, 0x93, 0x3a, 0x98, 0xe8, 0x98, 0xda, 0x2e, 0x19, 0xe1, 0x96, 0x61, 0x19, 0x13, 0x36, 0xfc,
+	0xc6, 0xc5, 0xd4, 0x41, 0x08, 0x72, 0x64, 0xd6, 0x6c, 0x28, 0xd2, 0xae, 0x74, 0x50, 0xd4, 0xf9,
+	0x37, 0x52, 0x60, 0xfd, 0x12, 0x13, 0x6a, 0xda, 0x96, 0x92, 0xe1, 0x64, 0x7f, 0x88, 0x76, 0xa1,
+	0x34, 0xb7, 0xa7, 0xe6, 0xe8, 0xea, 0x73, 0x62, 0xbb, 0x73, 0x25, 0xcb, 0x67, 0xa3, 0x24, 0xa4,
+	0x43, 0xf1, 0xcc, 0x35, 0xa7, 0xe3, 0xa6, 0x75, 0x6e, 0x2b, 0xb9, 0xdd, 0xec, 0x41, 0xe9, 0xe8,
+	0x51, 0x8d, 0xeb, 0x5b, 0xbb, 0x5e, 0x93, 0xda, 0xb1, 0xcf, 0xa6, 0x59, 0x0e, 0xb9, 0xd2, 0x43,
+	0x31, 0xe8, 0x0e, 0xe4, 0x47, 0xb6, 0x75, 0x6e, 0x4e, 0x94, 0x35, 0xbe, 0xa0, 0x18, 0xa1, 0x9f,
+	0x43, 0x09, 0xbf, 0x71, 0x88, 0x71, 0xe2, 0x4d, 0xe6, 0xf9, 0x6a, 0x1f, 0xaf, 0xb6, 0x9a, 0x16,
+	0x32, 0x7a, 0xeb, 0x45, 0x45, 0x55, 0x9f, 0x41, 0x39, 0xae, 0x0e, 0x92, 0x21, 0x7b, 0x81, 0xaf,
+	0x84, 0x99, 0xd8, 0x27, 0xda, 0x86, 0xb5, 0x4b, 0x63, 0xea, 0x62, 0x61, 0x23, 0x6f, 0xf0, 0x24,
+	0xf3, 0x89, 0x54, 0xfd, 0x14, 0xe4, 0x45, 0xf1, 0x6f, 0xc3, 0xaf, 0xfe, 0x00, 0x1e, 0x2c, 0xd5,
+	0x9e, 0xce, 0x6d, 0x8b, 0x62, 0xf5, 0x5b, 0x09, 0x6e, 0xd7, 0xa7, 0x53, 0x7b, 0x64, 0x38, 0xa6,
+	0x6d, 0xf9, 0xce, 0x3c, 0x80, 0x9c, 0x41, 0x2f, 0xa8, 0x22, 0x71, 0x4b, 0x6c, 0x0b, 0x4b, 0x84,
+	0xb8, 0x3a, 0xbd, 0xd0, 0x39, 0x02, 0x3d, 0x83, 0x02, 0xc1, 0x53, 0x6c, 0x50, 0x4c, 0xf9, 0xfa,
+	0xa5, 0xa3, 0xdd, 0x04, 0x5a, 0x17, 0x00, 0x21, 0x5d, 0x0f, 0x38, 0x82, 0xa0, 0xc9, 0x86, 0x41,
+	0xa3, 0x7e, 0x27, 0x01, 0xaa, 0xcf, 0xe7, 0x53, 0x33, 0xae, 0x52, 0x0d, 0xb2, 0x16, 0xfe, 0xa5,
+	0xd0, 0x68, 0xc7, 0x5f, 0x63, 0x3c, 0x4e, 0x42, 0x75, 0x06, 0x44, 0x8f, 0x21, 0x4f, 0xf0, 0xcc,
+	0xbe, 0x64, 0x66, 0x61, 0x2c, 0x0f, 0x02, 0x77, 0x32, 0x62, 0x0a, 0x97, 0x80, 0xa7, 0xea, 0xf4,
+	0x02, 0x4a, 0x6d, 0x7b, 0x8c, 0x7d, 0x5d, 0xf6, 0x60, 0xcd, 0xb2, 0xc7, 0xd8, 0xb7, 0xcf, 0x96,
+	0x10, 0xcd, 0x20, 0xcc, 0xd1, 0xba, 0x37, 0x1b, 0x48, 0xca, 0x44, 0x24, 0xfd, 0x93, 0xed, 0x2e,
+	0x62, 0x19, 0xcf, 0x0d, 0xe8, 0x87, 0xd1, 0xdd, 0xdd, 0x4e, 0x5a, 0x90, 0x6f, 0xe9, 0x51, 0x60,
+	0xeb, 0xb1, 0xd8, 0x94, 0xb2, 0xcc, 0xd6, 0x81, 0x8d, 0xc7, 0xe8, 0x33, 0xd8, 0xf0, 0xbf, 0xeb,
+	0xcc, 0xa7, 0x59, 0xce, 0xf9, 0xbd, 0x54, 0x9f, 0x0a, 0xe6, 0x18, 0x03, 0xfa, 0x84, 0x2d, 0xfb,
+	0x1a, 0x8f, 0x1c, 0x3c, 0x16, 0x07, 0x71, 0x27, 0xb0, 0xa5, 0x47, 0x8e, 0x0b, 0x09, 0xd0, 0xea,
+	0x9f, 0x25, 0xa8, 0xc4, 0x2c, 0x2d, 0x76, 0xfb, 0x71, 0x44, 0xa2, 0xb7, 0xe5, 0xea, 0xa2, 0xc4,
+	0x08, 0x57, 0x80, 0x65, 0x7c, 0xc6, 0x68, 0x84, 0xe7, 0x4e, 0x60, 0x00, 0x9f, 0xaf, 0x2e, 0xc8,
+	0x31, 0x3e, 0x1f, 0x8b, 0x3e, 0x82, 0x75, 0x77, 0x3e, 0x36, 0x18, 0x9b, 0xb7, 0xfb, 0x7b, 0x82,
+	0x6d, 0xe0, 0x51, 0xa3, 0x5c, 0x3e, 0x52, 0x9d, 0xc3, 0x86, 0xe7, 0x73, 0xa1, 0xf4, 0x61, 0x42,
+	0xe9, 0xca, 0x82, 0xd2, 0x1c, 0x1e, 0x6a, 0x7b, 0x98, 0xd0, 0xb6, 0xb2, 0xa0, 0xad, 0xc7, 0xe0,
+	0x83, 0xd4, 0x3f, 0x4a, 0x80, 0x92, 0x1a, 0xa1, 0xf7, 0x61, 0xd3, 0x08, 0x87, 0x41, 0x8a, 0x8d,
+	0x13, 0x59, 0x16, 0xa0, 0x8e, 0xe1, 0x04, 0x59, 0x80, 0x0f, 0xd0, 0x13, 0x50, 0xf8, 0x47, 0x9f,
+	0x18, 0x16, 0x35, 0x19, 0xb4, 0x6f, 0xce, 0x30, 0x75, 0x8c, 0x99, 0x97, 0x74, 0xb3, 0xfa, 0xd2,
+	0x79, 0x96, 0xbd, 0x67, 0x98, 0x52, 0x63, 0x82, 0x95, 0x9c, 0x97, 0xbd, 0xc5, 0x50, 0xed, 0x41,
+	0x25, 0xc5, 0x51, 0x2b, 0x2a, 0x7a, 0x87, 0x1d, 0x4c, 0x83, 0x06, 0x35, 0x41, 0x8c, 0xd4, 0xa7,
+	0x50, 0x49, 0xf1, 0xe2, 0x6a, 0x42, 0xd5, 0x4f, 0x61, 0x23, 0xea, 0x05, 0xb6, 0x08, 0x3b, 0x83,
+	0x01, 0x5c, 0x8c, 0x96, 0x2e, 0xbe, 0x0f, 0x1b, 0x51, 0xa7, 0x2c, 0xe3, 0x57, 0x7f, 0x2b, 0x41,
+	0xc1, 0x4f, 0xa5, 0xe8, 0x19, 0x14, 0x89, 0xf8, 0xf6, 0x53, 0xc1, 0xfd, 0x20, 0x24, 0x3c, 0x7a,
+	0xf0, 0x41, 0x45, 0x31, 0x0a, 0x18, 0xaa, 0x2d, 0x28, 0xc7, 0x27, 0x53, 0x52, 0xfb, 0x5e, 0x34,
+	0xb5, 0x87, 0x89, 0xe6, 0x95, 0x6b, 0x58, 0x8e, 0xe9, 0x5c, 0x45, 0x73, 0xfd, 0x2e, 0x14, 0x7c,
+	0x72, 0x58, 0x11, 0x24, 0xee, 0x62, 0x6f, 0xa0, 0x7e, 0x97, 0x83, 0xcd, 0xd8, 0x49, 0xe5, 0xb6,
+	0x0d, 0x08, 0x2f, 0x83, 0xa5, 0xe3, 0xc4, 0xa4, 0x07, 0x32, 0x69, 0x6e, 0x7d, 0x1f, 0x36, 0xe7,
+	0x06, 0x71, 0x78, 0x0c, 0xb5, 0x8d, 0x19, 0x16, 0xf9, 0x33, 0x4e, 0x44, 0x1f, 0x42, 0xc9, 0xb7,
+	0x40, 0x9d, 0x5e, 0xf0, 0xb8, 0x0a, 0xb7, 0xe5, 0x9b, 0x43, 0x8f, 0x62, 0xd0, 0x3e, 0x94, 0x67,
+	0xc6, 0x9b, 0x50, 0x71, 0xca, 0x8b, 0xf7, 0x9a, 0xbe, 0x40, 0x45, 0x55, 0x28, 0xcc, 0x89, 0x69,
+	0x13, 0xd3, 0xb9, 0x52, 0xf2, 0x1c, 0x11, 0x8c, 0xd1, 0x31, 0xec, 0xe0, 0x37, 0x78, 0xe4, 0xfa,
+	0x01, 0x6e, 0xbb, 0x4e, 0xcb, 0x9c, 0x4e, 0xcd, 0x1e, 0x1e, 0xd9, 0xd6, 0x98, 0x2a, 0xeb, 0xdc,
+	0x4e, 0xd7, 0x62, 0xd0, 0x11, 0xe4, 0x1c, 0x63, 0x42, 0x95, 0x42, 0xcc, 0xd1, 0x31, 0x83, 0xd6,
+	0xfa, 0xc6, 0x44, 0x38, 0x9a, 0x63, 0x99, 0x51, 0x1c, 0x83, 0x5e, 0xf0, 0x8e, 0x86, 0x1b, 0xa5,
+	0xe8, 0x19, 0x25, 0x46, 0xe4, 0xcd, 0xd0, 0xd4, 0x18, 0xe1, 0xaf, 0xed, 0xe9, 0x18, 0x13, 0x05,
+	0x76, 0xa5, 0x83, 0x82, 0x1e, 0x25, 0xa1, 0xfb, 0x00, 0x1d, 0x62, 0x4e, 0x4c, 0xcb, 0x70, 0x6c,
+	0xa2, 0x94, 0x38, 0x20, 0x42, 0xa9, 0x3e, 0x86, 0x62, 0xb0, 0xf4, 0x5b, 0x75, 0x08, 0x7f, 0xcb,
+	0xc2, 0x7b, 0xa9, 0x45, 0x74, 0xc5, 0xc3, 0xbc, 0x03, 0xc5, 0x6f, 0x5c, 0xec, 0x62, 0xbe, 0x39,
+	0x4f, 0x7a, 0x48, 0x58, 0x31, 0x26, 0x1e, 0x42, 0xd6, 0x9d, 0x98, 0x22, 0x16, 0xfc, 0xba, 0x34,
+	0xa0, 0x98, 0x70, 0x0b, 0xb1, 0x82, 0x4a, 0x66, 0xa2, 0x0a, 0xba, 0x13, 0x13, 0x3d, 0x11, 0x7e,
+	0x58, 0xe3, 0x7e, 0xd8, 0xbf, 0xae, 0x13, 0x48, 0xf8, 0xe3, 0xa6, 0x38, 0xc8, 0xaf, 0x10, 0x07,
+	0x8f, 0xa1, 0x1c, 0x71, 0x0d, 0x8b, 0xe2, 0xf5, 0xf4, 0x28, 0x5e, 0x80, 0xa1, 0x0f, 0xa0, 0x32,
+	0x31, 0xac, 0x49, 0xcf, 0xeb, 0xc8, 0x4d, 0x6b, 0xd2, 0x73, 0xae, 0xa6, 0x58, 0x29, 0x70, 0x9b,
+	0xa4, 0x4d, 0xfd, 0xf7, 0x6e, 0x3d, 0x07, 0x65, 0x59, 0x9f, 0xb3, 0xa2, 0x63, 0x13, 0xae, 0xcb,
+	0xa4, 0xb8, 0x4e, 0x3d, 0x86, 0xed, 0x34, 0x47, 0xb1, 0xce, 0xc7, 0xa5, 0x98, 0xf8, 0x97, 0x01,
+	0xf6, 0xcd, 0x52, 0xea, 0x84, 0xe1, 0x28, 0x2f, 0x86, 0x45, 0x5d, 0x8c, 0xd4, 0x7f, 0x65, 0x01,
+	0xc2, 0x53, 0xb4, 0x62, 0x4e, 0x6a, 0x41, 0x39, 0x24, 0x30, 0x1b, 0x89, 0x0a, 0xbb, 0x97, 0x38,
+	0x96, 0x91, 0xcf, 0x30, 0x1a, 0x16, 0x98, 0x99, 0xbe, 0x83, 0x41, 0xd8, 0xf3, 0xb1, 0x6f, 0xf4,
+	0x14, 0x64, 0x3f, 0x0d, 0x75, 0x31, 0xe1, 0x52, 0x78, 0xe6, 0x49, 0xf1, 0x74, 0x02, 0x78, 0x6d,
+	0x32, 0x0a, 0x6b, 0x4b, 0x21, 0x56, 0x9b, 0x12, 0x8e, 0x29, 0xae, 0xe4, 0x18, 0x48, 0x3b, 0x53,
+	0x89, 0xc4, 0x53, 0x5a, 0x21, 0xf1, 0x6c, 0x24, 0x12, 0x4f, 0xb5, 0x0e, 0x95, 0x14, 0xfb, 0xbd,
+	0x4d, 0x2c, 0x7e, 0x91, 0x2b, 0xac, 0xcb, 0x85, 0x48, 0x56, 0x50, 0xff, 0x22, 0xc1, 0xbd, 0xa5,
+	0x97, 0x03, 0x74, 0x0a, 0xdb, 0xa1, 0x73, 0x68, 0xdf, 0x16, 0xf3, 0xa2, 0xbe, 0x2e, 0x6f, 0x78,
+	0x53, 0xb9, 0xd0, 0x00, 0xee, 0x1a, 0xd1, 0x0c, 0x1d, 0x11, 0x98, 0xb9, 0xb9, 0x0f, 0x5e, 0xc6,
+	0xab, 0xfe, 0x7b, 0xe1, 0xd6, 0xe4, 0x2d, 0x96, 0x70, 0x8d, 0xb4, 0xc4, 0x35, 0x2b, 0x94, 0xd3,
+	0xb4, 0x88, 0xfc, 0x29, 0x6c, 0x39, 0x98, 0xcc, 0x58, 0xce, 0x67, 0xde, 0xb8, 0x9a, 0x7b, 0x8d,
+	0x59, 0xf9, 0xe8, 0x8e, 0xd8, 0x44, 0x3f, 0x3e, 0xab, 0x2f, 0xc2, 0xa3, 0x2d, 0xdd, 0x5a, 0xac,
+	0xa5, 0x4b, 0x1e, 0xbb, 0x7c, 0xca, 0xb1, 0x53, 0xff, 0x21, 0xc1, 0x76, 0x9a, 0xa5, 0xde, 0xe9,
+	0xd6, 0x13, 0xaa, 0x64, 0xd3, 0x32, 0xc0, 0xff, 0xd1, 0x18, 0xea, 0xef, 0x73, 0x50, 0xf0, 0x2f,
+	0x73, 0x4b, 0x5b, 0xc9, 0x47, 0x90, 0x37, 0x46, 0x8e, 0xff, 0xb6, 0x51, 0x0e, 0x2e, 0x45, 0x3e,
+	0x63, 0xad, 0xce, 0x67, 0x9f, 0x13, 0x7b, 0xa6, 0xb7, 0x74, 0x81, 0x45, 0x9f, 0x01, 0x18, 0x8e,
+	0x43, 0xcc, 0x33, 0xd7, 0xc1, 0xfe, 0x5d, 0xec, 0x41, 0x82, 0x33, 0x40, 0x78, 0xe9, 0x2a, 0xc2,
+	0x82, 0xea, 0x50, 0x11, 0x6f, 0x3a, 0xc6, 0xd9, 0x14, 0xfb, 0x29, 0x68, 0x59, 0x27, 0x95, 0x86,
+	0x65, 0x99, 0xcd, 0x1e, 0x8d, 0xdc, 0xb9, 0x89, 0xc7, 0x01, 0xff, 0xb2, 0xcc, 0xb6, 0x08, 0x44,
+	0x27, 0x50, 0xc1, 0x6f, 0x4c, 0xea, 0x98, 0xd6, 0x24, 0xda, 0x93, 0xe5, 0x97, 0xdd, 0x5c, 0xd3,
+	0xd0, 0xd5, 0x9f, 0xc0, 0xd6, 0xc2, 0x1e, 0xdf, 0xaa, 0xbc, 0xfd, 0x9a, 0x75, 0xeb, 0xa1, 0x71,
+	0x51, 0x15, 0xee, 0x0c, 0xda, 0x2f, 0xdb, 0x9d, 0x9f, 0xb5, 0x87, 0xf5, 0x93, 0x7e, 0xb3, 0xd3,
+	0x1e, 0x3e, 0xd7, 0x3b, 0xad, 0xa1, 0xde, 0x92, 0x6f, 0x21, 0x80, 0xfc, 0x89, 0xae, 0xd5, 0xfb,
+	0x9a, 0x2c, 0xb1, 0xef, 0x41, 0xb7, 0xc1, 0xbe, 0x33, 0xa8, 0x0c, 0xd0, 0xd0, 0xeb, 0xcd, 0xf6,
+	0xb0, 0xdd, 0x69, 0x68, 0x72, 0x16, 0x6d, 0x41, 0xa9, 0xa1, 0x9d, 0x74, 0x5a, 0xcd, 0x5e, 0xaf,
+	0xd9, 0x69, 0xcb, 0x39, 0xa4, 0xc0, 0xb6, 0x07, 0xe8, 0x77, 0x86, 0xbd, 0x93, 0x17, 0x5a, 0x63,
+	0x70, 0x5a, 0x3f, 0x3e, 0xd5, 0xe4, 0x35, 0xf5, 0x57, 0xf0, 0x5e, 0xea, 0xcd, 0xf7, 0x9d, 0xf6,
+	0xd3, 0xe1, 0x4d, 0x25, 0x1b, 0xbb, 0xa9, 0xbc, 0x86, 0x72, 0x97, 0xe0, 0x31, 0x03, 0x62, 0x5a,
+	0x27, 0x5e, 0x93, 0xb9, 0xc2, 0xaa, 0x61, 0x18, 0x67, 0x62, 0x61, 0x5c, 0x85, 0x82, 0x00, 0x7a,
+	0xed, 0x59, 0x41, 0x0f, 0xc6, 0xea, 0x5f, 0x33, 0xb0, 0xe7, 0x5d, 0x48, 0x4f, 0x6c, 0xcb, 0x31,
+	0x4c, 0x0b, 0x93, 0x68, 0x8b, 0x62, 0x38, 0xc1, 0x8b, 0xc8, 0x3e, 0x94, 0x85, 0xfa, 0x24, 0xd6,
+	0x55, 0x2c, 0x50, 0x93, 0xba, 0x66, 0xd2, 0x74, 0xd5, 0xfd, 0xbb, 0x6c, 0x96, 0x9f, 0xac, 0x67,
+	0xb1, 0xdb, 0xfa, 0x0d, 0xaa, 0xd4, 0x16, 0xc9, 0xe2, 0x26, 0x1c, 0xda, 0x33, 0x17, 0xb3, 0x27,
+	0x86, 0xad, 0x05, 0x0e, 0xb4, 0x03, 0x8a, 0x1f, 0x4e, 0xc2, 0xf1, 0xcd, 0xf6, 0xe7, 0xc3, 0x5e,
+	0x9f, 0x05, 0xce, 0x2d, 0x54, 0x82, 0xf5, 0xde, 0xcb, 0x66, 0xb7, 0xab, 0x35, 0x64, 0x09, 0x6d,
+	0x42, 0x51, 0x40, 0xb4, 0x86, 0x9c, 0x41, 0x1b, 0x50, 0xd0, 0xb5, 0x9e, 0xa6, 0x7f, 0xa9, 0x35,
+	0xe4, 0x2c, 0x0b, 0xb7, 0xe7, 0xf5, 0x26, 0x9b, 0xc9, 0xa9, 0xdf, 0x66, 0xa0, 0x1a, 0xe8, 0x7f,
+	0x6e, 0x4e, 0x5c, 0x12, 0x6b, 0xca, 0x52, 0x9e, 0x8a, 0x56, 0x78, 0x23, 0x0d, 0xdf, 0x33, 0x73,
+	0xb1, 0xf7, 0xcc, 0x7e, 0xfc, 0x3d, 0xd3, 0xeb, 0x94, 0x8f, 0x16, 0xad, 0x98, 0xd0, 0xe2, 0x86,
+	0xb7, 0xcc, 0xff, 0xf1, 0x35, 0xf2, 0x8b, 0x5c, 0x41, 0x92, 0x33, 0xfa, 0xba, 0xa7, 0x23, 0x55,
+	0x7f, 0x97, 0x81, 0x92, 0x76, 0x89, 0x2d, 0x47, 0xc7, 0x23, 0x9b, 0x8c, 0xd1, 0x8f, 0x21, 0xe7,
+	0xb0, 0x2c, 0x2e, 0x71, 0x9f, 0xdf, 0x15, 0xda, 0x46, 0x10, 0x35, 0x9e, 0xc6, 0x39, 0x88, 0x45,
+	0xad, 0x7d, 0xc6, 0x8e, 0x60, 0x60, 0xb3, 0x60, 0xcc, 0xf2, 0x3a, 0x6f, 0x2d, 0x83, 0xea, 0xe9,
+	0x0f, 0x97, 0xc5, 0xc0, 0xf5, 0x65, 0xd1, 0xf1, 0x1f, 0x44, 0xda, 0x86, 0x65, 0x8b, 0x1b, 0x42,
+	0x9c, 0xa8, 0x76, 0x20, 0xc7, 0x2b, 0x4a, 0x24, 0x70, 0xb4, 0x2f, 0xb5, 0x76, 0x5f, 0xd7, 0x4e,
+	0x3a, 0x7a, 0x63, 0xd8, 0xff, 0xaa, 0x2b, 0x02, 0x47, 0xd7, 0x5e, 0x0d, 0xb4, 0x5e, 0x5f, 0x96,
+	0xd0, 0x3a, 0x64, 0xeb, 0xdd, 0xae, 0x9c, 0x41, 0x05, 0xc8, 0x89, 0x0c, 0x54, 0x84, 0xb5, 0x57,
+	0x03, 0x6d, 0xa0, 0xc9, 0xb9, 0x1f, 0xfd, 0x46, 0x82, 0xad, 0x85, 0xfa, 0x15, 0x15, 0xde, 0xd7,
+	0xf4, 0x56, 0xb3, 0x5d, 0xe7, 0x99, 0x4e, 0x08, 0xbf, 0x0d, 0x9b, 0xbd, 0x7e, 0x87, 0x45, 0xe5,
+	0xf0, 0xf8, 0x2b, 0x96, 0xf9, 0x24, 0xb6, 0x5e, 0xbf, 0xd9, 0xd2, 0x3a, 0x83, 0xbe, 0x9c, 0x61,
+	0x29, 0xb2, 0xab, 0x6b, 0x5a, 0xab, 0xdb, 0xf7, 0x10, 0x7e, 0xd4, 0xea, 0x72, 0x96, 0x65, 0xba,
+	0xee, 0x69, 0xfd, 0x44, 0x7b, 0xd1, 0x39, 0x6d, 0x68, 0xfa, 0x50, 0xd7, 0xf8, 0xa8, 0x21, 0xe7,
+	0x8e, 0xfe, 0x9e, 0x81, 0x62, 0xcf, 0xff, 0x83, 0x80, 0x5e, 0xc3, 0xdd, 0x25, 0xcf, 0xc9, 0x68,
+	0x6f, 0xa5, 0xc7, 0xf2, 0xea, 0xfe, 0x4d, 0x30, 0xf1, 0x2a, 0x7d, 0x0b, 0xb5, 0x40, 0xf6, 0x02,
+	0x35, 0x72, 0x35, 0x48, 0x6b, 0xfe, 0x3c, 0xb9, 0xf7, 0x52, 0x66, 0x7c, 0x51, 0x07, 0xd2, 0x07,
+	0x12, 0xea, 0xc2, 0x6d, 0x21, 0x2e, 0xf2, 0xb4, 0x14, 0x70, 0x25, 0x2e, 0x49, 0xd5, 0x6a, 0xda,
+	0x54, 0x4c, 0xe2, 0x53, 0x00, 0x4f, 0x22, 0x7f, 0x2f, 0x42, 0x91, 0x12, 0xee, 0xcb, 0xa8, 0xc4,
+	0x68, 0x51, 0xe6, 0x27, 0x4f, 0xa1, 0x48, 0xcd, 0x21, 0xc5, 0x23, 0x82, 0x1d, 0xf4, 0xfd, 0x9a,
+	0xf7, 0xff, 0xa5, 0xe6, 0xff, 0x7f, 0xa9, 0x3d, 0x37, 0xf1, 0x74, 0xdc, 0x99, 0x7b, 0x95, 0xf5,
+	0x0f, 0x05, 0x2f, 0x2b, 0x53, 0x76, 0x03, 0x25, 0xd8, 0x39, 0x2e, 0xfd, 0xa2, 0x38, 0x35, 0xcf,
+	0x0e, 0x27, 0xf6, 0x21, 0x35, 0xcf, 0xf2, 0x9c, 0xe9, 0xa3, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff,
+	0x21, 0x7c, 0x57, 0x20, 0xf2, 0x19, 0x00, 0x00,
 }
diff --git a/scheduler-interface-spec.md b/scheduler-interface-spec.md
index 566d470..f5265fb 100644
--- a/scheduler-interface-spec.md
+++ b/scheduler-interface-spec.md
@@ -233,6 +233,9 @@ message RegisterResourceManagerRequest {
 
   // Pass the serialized configuration for this policyGroup to core.
   string config = 5;
+
+  // Additional configuration key/value pairs for configuration not related to the policyGroup.
+  map<string, string> extraConfig = 6;
 }
 
 // Upon success, scheduler returns RegisterResourceManagerResponse to RM, otherwise RM receives exception.
@@ -783,6 +786,9 @@ message UpdateConfigurationRequest {
   // New configuration to update
   string config = 4;
 
+  // Additional configuration key/value pairs for configuration not related to the policyGroup.
+  map<string, string> extraConfig = 5;
+
   reserved 1;
   reserved "configs";
 }
diff --git a/si.proto b/si.proto
index 46c3822..42233e3 100644
--- a/si.proto
+++ b/si.proto
@@ -81,6 +81,9 @@ message RegisterResourceManagerRequest {
 
   // Pass the serialized configuration for this policyGroup to core.
   string config = 5;
+
+  // Additional configuration key/value pairs for configuration not related to the policyGroup.
+  map<string, string> extraConfig = 6;
 }
 
 // Upon success, scheduler returns RegisterResourceManagerResponse to RM, otherwise RM receives exception.
@@ -442,6 +445,9 @@ message UpdateConfigurationRequest {
   // New configuration to update
   string config = 4;
 
+  // Additional configuration key/value pairs for configuration not related to the policyGroup.
+  map<string, string> extraConfig = 5;
+
   reserved 1;
   reserved "configs";
 }