diff --git a/app/v1/billing.pb.go b/app/v1/billing.pb.go
index 525fe2111..f929a2a3d 100644
--- a/app/v1/billing.pb.go
+++ b/app/v1/billing.pb.go
@@ -67,6 +67,122 @@ func (PaymentMethodType) EnumDescriptor() ([]byte, []int) {
 	return file_app_v1_billing_proto_rawDescGZIP(), []int{0}
 }
 
+type UsageCostType int32
+
+const (
+	UsageCostType_USAGE_COST_TYPE_UNSPECIFIED               UsageCostType = 0
+	UsageCostType_USAGE_COST_TYPE_DATA_UPLOAD               UsageCostType = 1
+	UsageCostType_USAGE_COST_TYPE_DATA_EGRESS               UsageCostType = 2
+	UsageCostType_USAGE_COST_TYPE_REMOTE_CONTROL            UsageCostType = 3
+	UsageCostType_USAGE_COST_TYPE_STANDARD_COMPUTE          UsageCostType = 4
+	UsageCostType_USAGE_COST_TYPE_CLOUD_STORAGE             UsageCostType = 5
+	UsageCostType_USAGE_COST_TYPE_BINARY_DATA_CLOUD_STORAGE UsageCostType = 6
+	UsageCostType_USAGE_COST_TYPE_OTHER_CLOUD_STORAGE       UsageCostType = 7
+	UsageCostType_USAGE_COST_TYPE_PER_MACHINE               UsageCostType = 8
+)
+
+// Enum value maps for UsageCostType.
+var (
+	UsageCostType_name = map[int32]string{
+		0: "USAGE_COST_TYPE_UNSPECIFIED",
+		1: "USAGE_COST_TYPE_DATA_UPLOAD",
+		2: "USAGE_COST_TYPE_DATA_EGRESS",
+		3: "USAGE_COST_TYPE_REMOTE_CONTROL",
+		4: "USAGE_COST_TYPE_STANDARD_COMPUTE",
+		5: "USAGE_COST_TYPE_CLOUD_STORAGE",
+		6: "USAGE_COST_TYPE_BINARY_DATA_CLOUD_STORAGE",
+		7: "USAGE_COST_TYPE_OTHER_CLOUD_STORAGE",
+		8: "USAGE_COST_TYPE_PER_MACHINE",
+	}
+	UsageCostType_value = map[string]int32{
+		"USAGE_COST_TYPE_UNSPECIFIED":               0,
+		"USAGE_COST_TYPE_DATA_UPLOAD":               1,
+		"USAGE_COST_TYPE_DATA_EGRESS":               2,
+		"USAGE_COST_TYPE_REMOTE_CONTROL":            3,
+		"USAGE_COST_TYPE_STANDARD_COMPUTE":          4,
+		"USAGE_COST_TYPE_CLOUD_STORAGE":             5,
+		"USAGE_COST_TYPE_BINARY_DATA_CLOUD_STORAGE": 6,
+		"USAGE_COST_TYPE_OTHER_CLOUD_STORAGE":       7,
+		"USAGE_COST_TYPE_PER_MACHINE":               8,
+	}
+)
+
+func (x UsageCostType) Enum() *UsageCostType {
+	p := new(UsageCostType)
+	*p = x
+	return p
+}
+
+func (x UsageCostType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (UsageCostType) Descriptor() protoreflect.EnumDescriptor {
+	return file_app_v1_billing_proto_enumTypes[1].Descriptor()
+}
+
+func (UsageCostType) Type() protoreflect.EnumType {
+	return &file_app_v1_billing_proto_enumTypes[1]
+}
+
+func (x UsageCostType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use UsageCostType.Descriptor instead.
+func (UsageCostType) EnumDescriptor() ([]byte, []int) {
+	return file_app_v1_billing_proto_rawDescGZIP(), []int{1}
+}
+
+type SourceType int32
+
+const (
+	SourceType_SOURCE_TYPE_UNSPECIFIED SourceType = 0
+	SourceType_SOURCE_TYPE_ORG         SourceType = 1
+	SourceType_SOURCE_TYPE_FRAGMENT    SourceType = 2
+)
+
+// Enum value maps for SourceType.
+var (
+	SourceType_name = map[int32]string{
+		0: "SOURCE_TYPE_UNSPECIFIED",
+		1: "SOURCE_TYPE_ORG",
+		2: "SOURCE_TYPE_FRAGMENT",
+	}
+	SourceType_value = map[string]int32{
+		"SOURCE_TYPE_UNSPECIFIED": 0,
+		"SOURCE_TYPE_ORG":         1,
+		"SOURCE_TYPE_FRAGMENT":    2,
+	}
+)
+
+func (x SourceType) Enum() *SourceType {
+	p := new(SourceType)
+	*p = x
+	return p
+}
+
+func (x SourceType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (SourceType) Descriptor() protoreflect.EnumDescriptor {
+	return file_app_v1_billing_proto_enumTypes[2].Descriptor()
+}
+
+func (SourceType) Type() protoreflect.EnumType {
+	return &file_app_v1_billing_proto_enumTypes[2]
+}
+
+func (x SourceType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use SourceType.Descriptor instead.
+func (SourceType) EnumDescriptor() ([]byte, []int) {
+	return file_app_v1_billing_proto_rawDescGZIP(), []int{2}
+}
+
 type InvoiceSummary struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -154,22 +270,17 @@ func (x *InvoiceSummary) GetPaidDate() *timestamppb.Timestamp {
 	return nil
 }
 
-type BillableResourceEvent struct {
+type PaymentMethodCard struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id                string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Type              string                 `protobuf:"bytes,2,opt,name=type,proto3" json:"type,omitempty"`
-	UsageQuantity     float64                `protobuf:"fixed64,3,opt,name=usage_quantity,json=usageQuantity,proto3" json:"usage_quantity,omitempty"`
-	UsageQuantityUnit string                 `protobuf:"bytes,4,opt,name=usage_quantity_unit,json=usageQuantityUnit,proto3" json:"usage_quantity_unit,omitempty"`
-	UsageCost         string                 `protobuf:"bytes,5,opt,name=usage_cost,json=usageCost,proto3" json:"usage_cost,omitempty"`
-	OccurredAt        *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=occurred_at,json=occurredAt,proto3" json:"occurred_at,omitempty"`
-	UserName          string                 `protobuf:"bytes,7,opt,name=user_name,json=userName,proto3" json:"user_name,omitempty"`
+	Brand          string `protobuf:"bytes,1,opt,name=brand,proto3" json:"brand,omitempty"`
+	LastFourDigits string `protobuf:"bytes,2,opt,name=last_four_digits,json=lastFourDigits,proto3" json:"last_four_digits,omitempty"`
 }
 
-func (x *BillableResourceEvent) Reset() {
-	*x = BillableResourceEvent{}
+func (x *PaymentMethodCard) Reset() {
+	*x = PaymentMethodCard{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_app_v1_billing_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -177,13 +288,13 @@ func (x *BillableResourceEvent) Reset() {
 	}
 }
 
-func (x *BillableResourceEvent) String() string {
+func (x *PaymentMethodCard) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*BillableResourceEvent) ProtoMessage() {}
+func (*PaymentMethodCard) ProtoMessage() {}
 
-func (x *BillableResourceEvent) ProtoReflect() protoreflect.Message {
+func (x *PaymentMethodCard) ProtoReflect() protoreflect.Message {
 	mi := &file_app_v1_billing_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -195,76 +306,35 @@ func (x *BillableResourceEvent) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use BillableResourceEvent.ProtoReflect.Descriptor instead.
-func (*BillableResourceEvent) Descriptor() ([]byte, []int) {
+// Deprecated: Use PaymentMethodCard.ProtoReflect.Descriptor instead.
+func (*PaymentMethodCard) Descriptor() ([]byte, []int) {
 	return file_app_v1_billing_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *BillableResourceEvent) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *BillableResourceEvent) GetType() string {
-	if x != nil {
-		return x.Type
-	}
-	return ""
-}
-
-func (x *BillableResourceEvent) GetUsageQuantity() float64 {
-	if x != nil {
-		return x.UsageQuantity
-	}
-	return 0
-}
-
-func (x *BillableResourceEvent) GetUsageQuantityUnit() string {
-	if x != nil {
-		return x.UsageQuantityUnit
-	}
-	return ""
-}
-
-func (x *BillableResourceEvent) GetUsageCost() string {
+func (x *PaymentMethodCard) GetBrand() string {
 	if x != nil {
-		return x.UsageCost
+		return x.Brand
 	}
 	return ""
 }
 
-func (x *BillableResourceEvent) GetOccurredAt() *timestamppb.Timestamp {
-	if x != nil {
-		return x.OccurredAt
-	}
-	return nil
-}
-
-func (x *BillableResourceEvent) GetUserName() string {
+func (x *PaymentMethodCard) GetLastFourDigits() string {
 	if x != nil {
-		return x.UserName
+		return x.LastFourDigits
 	}
 	return ""
 }
 
-type Invoice struct {
+type GetCurrentMonthUsageRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id            string                   `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	InvoiceDate   *timestamppb.Timestamp   `protobuf:"bytes,2,opt,name=invoice_date,json=invoiceDate,proto3" json:"invoice_date,omitempty"`
-	InvoiceAmount float64                  `protobuf:"fixed64,3,opt,name=invoice_amount,json=invoiceAmount,proto3" json:"invoice_amount,omitempty"`
-	Status        string                   `protobuf:"bytes,4,opt,name=status,proto3" json:"status,omitempty"`
-	DueDate       *timestamppb.Timestamp   `protobuf:"bytes,5,opt,name=due_date,json=dueDate,proto3" json:"due_date,omitempty"`
-	Items         []*BillableResourceEvent `protobuf:"bytes,6,rep,name=items,proto3" json:"items,omitempty"`
-	EmailedTo     string                   `protobuf:"bytes,7,opt,name=emailed_to,json=emailedTo,proto3" json:"emailed_to,omitempty"`
+	OrgId string `protobuf:"bytes,1,opt,name=org_id,json=orgId,proto3" json:"org_id,omitempty"`
 }
 
-func (x *Invoice) Reset() {
-	*x = Invoice{}
+func (x *GetCurrentMonthUsageRequest) Reset() {
+	*x = GetCurrentMonthUsageRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_app_v1_billing_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -272,13 +342,13 @@ func (x *Invoice) Reset() {
 	}
 }
 
-func (x *Invoice) String() string {
+func (x *GetCurrentMonthUsageRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Invoice) ProtoMessage() {}
+func (*GetCurrentMonthUsageRequest) ProtoMessage() {}
 
-func (x *Invoice) ProtoReflect() protoreflect.Message {
+func (x *GetCurrentMonthUsageRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_app_v1_billing_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -290,86 +360,100 @@ func (x *Invoice) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Invoice.ProtoReflect.Descriptor instead.
-func (*Invoice) Descriptor() ([]byte, []int) {
+// Deprecated: Use GetCurrentMonthUsageRequest.ProtoReflect.Descriptor instead.
+func (*GetCurrentMonthUsageRequest) Descriptor() ([]byte, []int) {
 	return file_app_v1_billing_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *Invoice) GetId() string {
+func (x *GetCurrentMonthUsageRequest) GetOrgId() string {
 	if x != nil {
-		return x.Id
+		return x.OrgId
 	}
 	return ""
 }
 
-func (x *Invoice) GetInvoiceDate() *timestamppb.Timestamp {
-	if x != nil {
-		return x.InvoiceDate
-	}
-	return nil
+type UsageCost struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ResourceType UsageCostType `protobuf:"varint,1,opt,name=resource_type,json=resourceType,proto3,enum=viam.app.v1.UsageCostType" json:"resource_type,omitempty"`
+	Cost         float64       `protobuf:"fixed64,2,opt,name=cost,proto3" json:"cost,omitempty"`
 }
 
-func (x *Invoice) GetInvoiceAmount() float64 {
-	if x != nil {
-		return x.InvoiceAmount
+func (x *UsageCost) Reset() {
+	*x = UsageCost{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_app_v1_billing_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
 	}
-	return 0
 }
 
-func (x *Invoice) GetStatus() string {
-	if x != nil {
-		return x.Status
-	}
-	return ""
+func (x *UsageCost) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
 
-func (x *Invoice) GetDueDate() *timestamppb.Timestamp {
-	if x != nil {
-		return x.DueDate
+func (*UsageCost) ProtoMessage() {}
+
+func (x *UsageCost) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_billing_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
 	}
-	return nil
+	return mi.MessageOf(x)
 }
 
-func (x *Invoice) GetItems() []*BillableResourceEvent {
+// Deprecated: Use UsageCost.ProtoReflect.Descriptor instead.
+func (*UsageCost) Descriptor() ([]byte, []int) {
+	return file_app_v1_billing_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *UsageCost) GetResourceType() UsageCostType {
 	if x != nil {
-		return x.Items
+		return x.ResourceType
 	}
-	return nil
+	return UsageCostType_USAGE_COST_TYPE_UNSPECIFIED
 }
 
-func (x *Invoice) GetEmailedTo() string {
+func (x *UsageCost) GetCost() float64 {
 	if x != nil {
-		return x.EmailedTo
+		return x.Cost
 	}
-	return ""
+	return 0
 }
 
-type PaymentMethodCard struct {
+type ResourceUsageCostsBySource struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Brand          string `protobuf:"bytes,1,opt,name=brand,proto3" json:"brand,omitempty"`
-	LastFourDigits string `protobuf:"bytes,2,opt,name=last_four_digits,json=lastFourDigits,proto3" json:"last_four_digits,omitempty"`
+	SourceType         SourceType          `protobuf:"varint,1,opt,name=source_type,json=sourceType,proto3,enum=viam.app.v1.SourceType" json:"source_type,omitempty"`
+	ResourceUsageCosts *ResourceUsageCosts `protobuf:"bytes,2,opt,name=resource_usage_costs,json=resourceUsageCosts,proto3" json:"resource_usage_costs,omitempty"`
+	TierName           string              `protobuf:"bytes,3,opt,name=tier_name,json=tierName,proto3" json:"tier_name,omitempty"`
 }
 
-func (x *PaymentMethodCard) Reset() {
-	*x = PaymentMethodCard{}
+func (x *ResourceUsageCostsBySource) Reset() {
+	*x = ResourceUsageCostsBySource{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_app_v1_billing_proto_msgTypes[3]
+		mi := &file_app_v1_billing_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
 }
 
-func (x *PaymentMethodCard) String() string {
+func (x *ResourceUsageCostsBySource) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*PaymentMethodCard) ProtoMessage() {}
+func (*ResourceUsageCostsBySource) ProtoMessage() {}
 
-func (x *PaymentMethodCard) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_billing_proto_msgTypes[3]
+func (x *ResourceUsageCostsBySource) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_billing_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -380,50 +464,60 @@ func (x *PaymentMethodCard) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use PaymentMethodCard.ProtoReflect.Descriptor instead.
-func (*PaymentMethodCard) Descriptor() ([]byte, []int) {
-	return file_app_v1_billing_proto_rawDescGZIP(), []int{3}
+// Deprecated: Use ResourceUsageCostsBySource.ProtoReflect.Descriptor instead.
+func (*ResourceUsageCostsBySource) Descriptor() ([]byte, []int) {
+	return file_app_v1_billing_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *PaymentMethodCard) GetBrand() string {
+func (x *ResourceUsageCostsBySource) GetSourceType() SourceType {
 	if x != nil {
-		return x.Brand
+		return x.SourceType
 	}
-	return ""
+	return SourceType_SOURCE_TYPE_UNSPECIFIED
 }
 
-func (x *PaymentMethodCard) GetLastFourDigits() string {
+func (x *ResourceUsageCostsBySource) GetResourceUsageCosts() *ResourceUsageCosts {
 	if x != nil {
-		return x.LastFourDigits
+		return x.ResourceUsageCosts
+	}
+	return nil
+}
+
+func (x *ResourceUsageCostsBySource) GetTierName() string {
+	if x != nil {
+		return x.TierName
 	}
 	return ""
 }
 
-type GetCurrentMonthUsageRequest struct {
+type ResourceUsageCosts struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	OrgId string `protobuf:"bytes,1,opt,name=org_id,json=orgId,proto3" json:"org_id,omitempty"`
+	UsageCosts           []*UsageCost `protobuf:"bytes,1,rep,name=usage_costs,json=usageCosts,proto3" json:"usage_costs,omitempty"`
+	Discount             float64      `protobuf:"fixed64,2,opt,name=discount,proto3" json:"discount,omitempty"`
+	TotalWithDiscount    float64      `protobuf:"fixed64,3,opt,name=total_with_discount,json=totalWithDiscount,proto3" json:"total_with_discount,omitempty"`
+	TotalWithoutDiscount float64      `protobuf:"fixed64,4,opt,name=total_without_discount,json=totalWithoutDiscount,proto3" json:"total_without_discount,omitempty"`
 }
 
-func (x *GetCurrentMonthUsageRequest) Reset() {
-	*x = GetCurrentMonthUsageRequest{}
+func (x *ResourceUsageCosts) Reset() {
+	*x = ResourceUsageCosts{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_app_v1_billing_proto_msgTypes[4]
+		mi := &file_app_v1_billing_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
 }
 
-func (x *GetCurrentMonthUsageRequest) String() string {
+func (x *ResourceUsageCosts) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*GetCurrentMonthUsageRequest) ProtoMessage() {}
+func (*ResourceUsageCosts) ProtoMessage() {}
 
-func (x *GetCurrentMonthUsageRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_billing_proto_msgTypes[4]
+func (x *ResourceUsageCosts) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_billing_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -434,16 +528,37 @@ func (x *GetCurrentMonthUsageRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GetCurrentMonthUsageRequest.ProtoReflect.Descriptor instead.
-func (*GetCurrentMonthUsageRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_billing_proto_rawDescGZIP(), []int{4}
+// Deprecated: Use ResourceUsageCosts.ProtoReflect.Descriptor instead.
+func (*ResourceUsageCosts) Descriptor() ([]byte, []int) {
+	return file_app_v1_billing_proto_rawDescGZIP(), []int{5}
 }
 
-func (x *GetCurrentMonthUsageRequest) GetOrgId() string {
+func (x *ResourceUsageCosts) GetUsageCosts() []*UsageCost {
 	if x != nil {
-		return x.OrgId
+		return x.UsageCosts
 	}
-	return ""
+	return nil
+}
+
+func (x *ResourceUsageCosts) GetDiscount() float64 {
+	if x != nil {
+		return x.Discount
+	}
+	return 0
+}
+
+func (x *ResourceUsageCosts) GetTotalWithDiscount() float64 {
+	if x != nil {
+		return x.TotalWithDiscount
+	}
+	return 0
+}
+
+func (x *ResourceUsageCosts) GetTotalWithoutDiscount() float64 {
+	if x != nil {
+		return x.TotalWithoutDiscount
+	}
+	return 0
 }
 
 type GetCurrentMonthUsageResponse struct {
@@ -451,25 +566,40 @@ type GetCurrentMonthUsageResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	StartDate                       *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_date,json=startDate,proto3" json:"start_date,omitempty"`
-	EndDate                         *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_date,json=endDate,proto3" json:"end_date,omitempty"`
-	CloudStorageUsageCost           float64                `protobuf:"fixed64,3,opt,name=cloud_storage_usage_cost,json=cloudStorageUsageCost,proto3" json:"cloud_storage_usage_cost,omitempty"`
-	DataUploadUsageCost             float64                `protobuf:"fixed64,4,opt,name=data_upload_usage_cost,json=dataUploadUsageCost,proto3" json:"data_upload_usage_cost,omitempty"`
-	DataEgresUsageCost              float64                `protobuf:"fixed64,5,opt,name=data_egres_usage_cost,json=dataEgresUsageCost,proto3" json:"data_egres_usage_cost,omitempty"`
-	RemoteControlUsageCost          float64                `protobuf:"fixed64,6,opt,name=remote_control_usage_cost,json=remoteControlUsageCost,proto3" json:"remote_control_usage_cost,omitempty"`
-	StandardComputeUsageCost        float64                `protobuf:"fixed64,7,opt,name=standard_compute_usage_cost,json=standardComputeUsageCost,proto3" json:"standard_compute_usage_cost,omitempty"`
-	DiscountAmount                  float64                `protobuf:"fixed64,8,opt,name=discount_amount,json=discountAmount,proto3" json:"discount_amount,omitempty"`
-	TotalUsageWithDiscount          float64                `protobuf:"fixed64,9,opt,name=total_usage_with_discount,json=totalUsageWithDiscount,proto3" json:"total_usage_with_discount,omitempty"`
-	TotalUsageWithoutDiscount       float64                `protobuf:"fixed64,10,opt,name=total_usage_without_discount,json=totalUsageWithoutDiscount,proto3" json:"total_usage_without_discount,omitempty"`
-	PerMachineUsageCost             float64                `protobuf:"fixed64,11,opt,name=per_machine_usage_cost,json=perMachineUsageCost,proto3" json:"per_machine_usage_cost,omitempty"`
-	BinaryDataCloudStorageUsageCost float64                `protobuf:"fixed64,12,opt,name=binary_data_cloud_storage_usage_cost,json=binaryDataCloudStorageUsageCost,proto3" json:"binary_data_cloud_storage_usage_cost,omitempty"`
-	OtherCloudStorageUsageCost      float64                `protobuf:"fixed64,13,opt,name=other_cloud_storage_usage_cost,json=otherCloudStorageUsageCost,proto3" json:"other_cloud_storage_usage_cost,omitempty"`
+	StartDate                  *timestamppb.Timestamp        `protobuf:"bytes,1,opt,name=start_date,json=startDate,proto3" json:"start_date,omitempty"`
+	EndDate                    *timestamppb.Timestamp        `protobuf:"bytes,2,opt,name=end_date,json=endDate,proto3" json:"end_date,omitempty"`
+	ResourceUsageCostsBySource []*ResourceUsageCostsBySource `protobuf:"bytes,14,rep,name=resource_usage_costs_by_source,json=resourceUsageCostsBySource,proto3" json:"resource_usage_costs_by_source,omitempty"`
+	Subtotal                   float64                       `protobuf:"fixed64,15,opt,name=subtotal,proto3" json:"subtotal,omitempty"`
+	// all fields below are deprecated
+	//
+	// Deprecated: Marked as deprecated in app/v1/billing.proto.
+	CloudStorageUsageCost float64 `protobuf:"fixed64,3,opt,name=cloud_storage_usage_cost,json=cloudStorageUsageCost,proto3" json:"cloud_storage_usage_cost,omitempty"`
+	// Deprecated: Marked as deprecated in app/v1/billing.proto.
+	DataUploadUsageCost float64 `protobuf:"fixed64,4,opt,name=data_upload_usage_cost,json=dataUploadUsageCost,proto3" json:"data_upload_usage_cost,omitempty"`
+	// Deprecated: Marked as deprecated in app/v1/billing.proto.
+	DataEgresUsageCost float64 `protobuf:"fixed64,5,opt,name=data_egres_usage_cost,json=dataEgresUsageCost,proto3" json:"data_egres_usage_cost,omitempty"`
+	// Deprecated: Marked as deprecated in app/v1/billing.proto.
+	RemoteControlUsageCost float64 `protobuf:"fixed64,6,opt,name=remote_control_usage_cost,json=remoteControlUsageCost,proto3" json:"remote_control_usage_cost,omitempty"`
+	// Deprecated: Marked as deprecated in app/v1/billing.proto.
+	StandardComputeUsageCost float64 `protobuf:"fixed64,7,opt,name=standard_compute_usage_cost,json=standardComputeUsageCost,proto3" json:"standard_compute_usage_cost,omitempty"`
+	// Deprecated: Marked as deprecated in app/v1/billing.proto.
+	DiscountAmount float64 `protobuf:"fixed64,8,opt,name=discount_amount,json=discountAmount,proto3" json:"discount_amount,omitempty"`
+	// Deprecated: Marked as deprecated in app/v1/billing.proto.
+	TotalUsageWithDiscount float64 `protobuf:"fixed64,9,opt,name=total_usage_with_discount,json=totalUsageWithDiscount,proto3" json:"total_usage_with_discount,omitempty"`
+	// Deprecated: Marked as deprecated in app/v1/billing.proto.
+	TotalUsageWithoutDiscount float64 `protobuf:"fixed64,10,opt,name=total_usage_without_discount,json=totalUsageWithoutDiscount,proto3" json:"total_usage_without_discount,omitempty"`
+	// Deprecated: Marked as deprecated in app/v1/billing.proto.
+	PerMachineUsageCost float64 `protobuf:"fixed64,11,opt,name=per_machine_usage_cost,json=perMachineUsageCost,proto3" json:"per_machine_usage_cost,omitempty"`
+	// Deprecated: Marked as deprecated in app/v1/billing.proto.
+	BinaryDataCloudStorageUsageCost float64 `protobuf:"fixed64,12,opt,name=binary_data_cloud_storage_usage_cost,json=binaryDataCloudStorageUsageCost,proto3" json:"binary_data_cloud_storage_usage_cost,omitempty"`
+	// Deprecated: Marked as deprecated in app/v1/billing.proto.
+	OtherCloudStorageUsageCost float64 `protobuf:"fixed64,13,opt,name=other_cloud_storage_usage_cost,json=otherCloudStorageUsageCost,proto3" json:"other_cloud_storage_usage_cost,omitempty"`
 }
 
 func (x *GetCurrentMonthUsageResponse) Reset() {
 	*x = GetCurrentMonthUsageResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_app_v1_billing_proto_msgTypes[5]
+		mi := &file_app_v1_billing_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -482,7 +612,7 @@ func (x *GetCurrentMonthUsageResponse) String() string {
 func (*GetCurrentMonthUsageResponse) ProtoMessage() {}
 
 func (x *GetCurrentMonthUsageResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_billing_proto_msgTypes[5]
+	mi := &file_app_v1_billing_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -495,7 +625,7 @@ func (x *GetCurrentMonthUsageResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetCurrentMonthUsageResponse.ProtoReflect.Descriptor instead.
 func (*GetCurrentMonthUsageResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_billing_proto_rawDescGZIP(), []int{5}
+	return file_app_v1_billing_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *GetCurrentMonthUsageResponse) GetStartDate() *timestamppb.Timestamp {
@@ -512,6 +642,21 @@ func (x *GetCurrentMonthUsageResponse) GetEndDate() *timestamppb.Timestamp {
 	return nil
 }
 
+func (x *GetCurrentMonthUsageResponse) GetResourceUsageCostsBySource() []*ResourceUsageCostsBySource {
+	if x != nil {
+		return x.ResourceUsageCostsBySource
+	}
+	return nil
+}
+
+func (x *GetCurrentMonthUsageResponse) GetSubtotal() float64 {
+	if x != nil {
+		return x.Subtotal
+	}
+	return 0
+}
+
+// Deprecated: Marked as deprecated in app/v1/billing.proto.
 func (x *GetCurrentMonthUsageResponse) GetCloudStorageUsageCost() float64 {
 	if x != nil {
 		return x.CloudStorageUsageCost
@@ -519,6 +664,7 @@ func (x *GetCurrentMonthUsageResponse) GetCloudStorageUsageCost() float64 {
 	return 0
 }
 
+// Deprecated: Marked as deprecated in app/v1/billing.proto.
 func (x *GetCurrentMonthUsageResponse) GetDataUploadUsageCost() float64 {
 	if x != nil {
 		return x.DataUploadUsageCost
@@ -526,6 +672,7 @@ func (x *GetCurrentMonthUsageResponse) GetDataUploadUsageCost() float64 {
 	return 0
 }
 
+// Deprecated: Marked as deprecated in app/v1/billing.proto.
 func (x *GetCurrentMonthUsageResponse) GetDataEgresUsageCost() float64 {
 	if x != nil {
 		return x.DataEgresUsageCost
@@ -533,6 +680,7 @@ func (x *GetCurrentMonthUsageResponse) GetDataEgresUsageCost() float64 {
 	return 0
 }
 
+// Deprecated: Marked as deprecated in app/v1/billing.proto.
 func (x *GetCurrentMonthUsageResponse) GetRemoteControlUsageCost() float64 {
 	if x != nil {
 		return x.RemoteControlUsageCost
@@ -540,6 +688,7 @@ func (x *GetCurrentMonthUsageResponse) GetRemoteControlUsageCost() float64 {
 	return 0
 }
 
+// Deprecated: Marked as deprecated in app/v1/billing.proto.
 func (x *GetCurrentMonthUsageResponse) GetStandardComputeUsageCost() float64 {
 	if x != nil {
 		return x.StandardComputeUsageCost
@@ -547,6 +696,7 @@ func (x *GetCurrentMonthUsageResponse) GetStandardComputeUsageCost() float64 {
 	return 0
 }
 
+// Deprecated: Marked as deprecated in app/v1/billing.proto.
 func (x *GetCurrentMonthUsageResponse) GetDiscountAmount() float64 {
 	if x != nil {
 		return x.DiscountAmount
@@ -554,6 +704,7 @@ func (x *GetCurrentMonthUsageResponse) GetDiscountAmount() float64 {
 	return 0
 }
 
+// Deprecated: Marked as deprecated in app/v1/billing.proto.
 func (x *GetCurrentMonthUsageResponse) GetTotalUsageWithDiscount() float64 {
 	if x != nil {
 		return x.TotalUsageWithDiscount
@@ -561,6 +712,7 @@ func (x *GetCurrentMonthUsageResponse) GetTotalUsageWithDiscount() float64 {
 	return 0
 }
 
+// Deprecated: Marked as deprecated in app/v1/billing.proto.
 func (x *GetCurrentMonthUsageResponse) GetTotalUsageWithoutDiscount() float64 {
 	if x != nil {
 		return x.TotalUsageWithoutDiscount
@@ -568,6 +720,7 @@ func (x *GetCurrentMonthUsageResponse) GetTotalUsageWithoutDiscount() float64 {
 	return 0
 }
 
+// Deprecated: Marked as deprecated in app/v1/billing.proto.
 func (x *GetCurrentMonthUsageResponse) GetPerMachineUsageCost() float64 {
 	if x != nil {
 		return x.PerMachineUsageCost
@@ -575,6 +728,7 @@ func (x *GetCurrentMonthUsageResponse) GetPerMachineUsageCost() float64 {
 	return 0
 }
 
+// Deprecated: Marked as deprecated in app/v1/billing.proto.
 func (x *GetCurrentMonthUsageResponse) GetBinaryDataCloudStorageUsageCost() float64 {
 	if x != nil {
 		return x.BinaryDataCloudStorageUsageCost
@@ -582,6 +736,7 @@ func (x *GetCurrentMonthUsageResponse) GetBinaryDataCloudStorageUsageCost() floa
 	return 0
 }
 
+// Deprecated: Marked as deprecated in app/v1/billing.proto.
 func (x *GetCurrentMonthUsageResponse) GetOtherCloudStorageUsageCost() float64 {
 	if x != nil {
 		return x.OtherCloudStorageUsageCost
@@ -600,7 +755,7 @@ type GetOrgBillingInformationRequest struct {
 func (x *GetOrgBillingInformationRequest) Reset() {
 	*x = GetOrgBillingInformationRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_app_v1_billing_proto_msgTypes[6]
+		mi := &file_app_v1_billing_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -613,7 +768,7 @@ func (x *GetOrgBillingInformationRequest) String() string {
 func (*GetOrgBillingInformationRequest) ProtoMessage() {}
 
 func (x *GetOrgBillingInformationRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_billing_proto_msgTypes[6]
+	mi := &file_app_v1_billing_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -626,7 +781,7 @@ func (x *GetOrgBillingInformationRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetOrgBillingInformationRequest.ProtoReflect.Descriptor instead.
 func (*GetOrgBillingInformationRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_billing_proto_rawDescGZIP(), []int{6}
+	return file_app_v1_billing_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *GetOrgBillingInformationRequest) GetOrgId() string {
@@ -652,7 +807,7 @@ type GetOrgBillingInformationResponse struct {
 func (x *GetOrgBillingInformationResponse) Reset() {
 	*x = GetOrgBillingInformationResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_app_v1_billing_proto_msgTypes[7]
+		mi := &file_app_v1_billing_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -665,7 +820,7 @@ func (x *GetOrgBillingInformationResponse) String() string {
 func (*GetOrgBillingInformationResponse) ProtoMessage() {}
 
 func (x *GetOrgBillingInformationResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_billing_proto_msgTypes[7]
+	mi := &file_app_v1_billing_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -678,7 +833,7 @@ func (x *GetOrgBillingInformationResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetOrgBillingInformationResponse.ProtoReflect.Descriptor instead.
 func (*GetOrgBillingInformationResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_billing_proto_rawDescGZIP(), []int{7}
+	return file_app_v1_billing_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *GetOrgBillingInformationResponse) GetType() PaymentMethodType {
@@ -720,7 +875,7 @@ type GetInvoicesSummaryRequest struct {
 func (x *GetInvoicesSummaryRequest) Reset() {
 	*x = GetInvoicesSummaryRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_app_v1_billing_proto_msgTypes[8]
+		mi := &file_app_v1_billing_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -733,7 +888,7 @@ func (x *GetInvoicesSummaryRequest) String() string {
 func (*GetInvoicesSummaryRequest) ProtoMessage() {}
 
 func (x *GetInvoicesSummaryRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_billing_proto_msgTypes[8]
+	mi := &file_app_v1_billing_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -746,7 +901,7 @@ func (x *GetInvoicesSummaryRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetInvoicesSummaryRequest.ProtoReflect.Descriptor instead.
 func (*GetInvoicesSummaryRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_billing_proto_rawDescGZIP(), []int{8}
+	return file_app_v1_billing_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *GetInvoicesSummaryRequest) GetOrgId() string {
@@ -770,7 +925,7 @@ type GetInvoicesSummaryResponse struct {
 func (x *GetInvoicesSummaryResponse) Reset() {
 	*x = GetInvoicesSummaryResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_app_v1_billing_proto_msgTypes[9]
+		mi := &file_app_v1_billing_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -783,7 +938,7 @@ func (x *GetInvoicesSummaryResponse) String() string {
 func (*GetInvoicesSummaryResponse) ProtoMessage() {}
 
 func (x *GetInvoicesSummaryResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_billing_proto_msgTypes[9]
+	mi := &file_app_v1_billing_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -796,7 +951,7 @@ func (x *GetInvoicesSummaryResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetInvoicesSummaryResponse.ProtoReflect.Descriptor instead.
 func (*GetInvoicesSummaryResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_billing_proto_rawDescGZIP(), []int{9}
+	return file_app_v1_billing_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *GetInvoicesSummaryResponse) GetOutstandingBalance() float64 {
@@ -825,7 +980,7 @@ type GetInvoicePdfRequest struct {
 func (x *GetInvoicePdfRequest) Reset() {
 	*x = GetInvoicePdfRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_app_v1_billing_proto_msgTypes[10]
+		mi := &file_app_v1_billing_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -838,7 +993,7 @@ func (x *GetInvoicePdfRequest) String() string {
 func (*GetInvoicePdfRequest) ProtoMessage() {}
 
 func (x *GetInvoicePdfRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_billing_proto_msgTypes[10]
+	mi := &file_app_v1_billing_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -851,7 +1006,7 @@ func (x *GetInvoicePdfRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetInvoicePdfRequest.ProtoReflect.Descriptor instead.
 func (*GetInvoicePdfRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_billing_proto_rawDescGZIP(), []int{10}
+	return file_app_v1_billing_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *GetInvoicePdfRequest) GetId() string {
@@ -879,7 +1034,7 @@ type GetInvoicePdfResponse struct {
 func (x *GetInvoicePdfResponse) Reset() {
 	*x = GetInvoicePdfResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_app_v1_billing_proto_msgTypes[11]
+		mi := &file_app_v1_billing_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -892,7 +1047,7 @@ func (x *GetInvoicePdfResponse) String() string {
 func (*GetInvoicePdfResponse) ProtoMessage() {}
 
 func (x *GetInvoicePdfResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_billing_proto_msgTypes[11]
+	mi := &file_app_v1_billing_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -905,7 +1060,7 @@ func (x *GetInvoicePdfResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetInvoicePdfResponse.ProtoReflect.Descriptor instead.
 func (*GetInvoicePdfResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_billing_proto_rawDescGZIP(), []int{11}
+	return file_app_v1_billing_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *GetInvoicePdfResponse) GetChunk() []byte {
@@ -927,7 +1082,7 @@ type SendPaymentRequiredEmailRequest struct {
 func (x *SendPaymentRequiredEmailRequest) Reset() {
 	*x = SendPaymentRequiredEmailRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_app_v1_billing_proto_msgTypes[12]
+		mi := &file_app_v1_billing_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -940,7 +1095,7 @@ func (x *SendPaymentRequiredEmailRequest) String() string {
 func (*SendPaymentRequiredEmailRequest) ProtoMessage() {}
 
 func (x *SendPaymentRequiredEmailRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_billing_proto_msgTypes[12]
+	mi := &file_app_v1_billing_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -953,7 +1108,7 @@ func (x *SendPaymentRequiredEmailRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SendPaymentRequiredEmailRequest.ProtoReflect.Descriptor instead.
 func (*SendPaymentRequiredEmailRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_billing_proto_rawDescGZIP(), []int{12}
+	return file_app_v1_billing_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *SendPaymentRequiredEmailRequest) GetCustomerOrgId() string {
@@ -979,7 +1134,7 @@ type SendPaymentRequiredEmailResponse struct {
 func (x *SendPaymentRequiredEmailResponse) Reset() {
 	*x = SendPaymentRequiredEmailResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_app_v1_billing_proto_msgTypes[13]
+		mi := &file_app_v1_billing_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -992,7 +1147,7 @@ func (x *SendPaymentRequiredEmailResponse) String() string {
 func (*SendPaymentRequiredEmailResponse) ProtoMessage() {}
 
 func (x *SendPaymentRequiredEmailResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_billing_proto_msgTypes[13]
+	mi := &file_app_v1_billing_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1005,7 +1160,7 @@ func (x *SendPaymentRequiredEmailResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SendPaymentRequiredEmailResponse.ProtoReflect.Descriptor instead.
 func (*SendPaymentRequiredEmailResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_billing_proto_rawDescGZIP(), []int{13}
+	return file_app_v1_billing_proto_rawDescGZIP(), []int{14}
 }
 
 var File_app_v1_billing_proto protoreflect.FileDescriptor
@@ -1032,192 +1187,227 @@ var file_app_v1_billing_proto_rawDesc = []byte{
 	0x70, 0x61, 0x69, 0x64, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
 	0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x08, 0x70, 0x61, 0x69,
-	0x64, 0x44, 0x61, 0x74, 0x65, 0x22, 0x8b, 0x02, 0x0a, 0x15, 0x42, 0x69, 0x6c, 0x6c, 0x61, 0x62,
-	0x6c, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12,
-	0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12,
-	0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74,
-	0x79, 0x70, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x75, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x71, 0x75, 0x61,
-	0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0d, 0x75, 0x73, 0x61,
-	0x67, 0x65, 0x51, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x2e, 0x0a, 0x13, 0x75, 0x73,
-	0x61, 0x67, 0x65, 0x5f, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x75, 0x6e, 0x69,
-	0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x75, 0x73, 0x61, 0x67, 0x65, 0x51, 0x75,
-	0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x6e, 0x69, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x75, 0x73,
-	0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x73, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x75, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x12, 0x3b, 0x0a, 0x0b, 0x6f, 0x63, 0x63,
-	0x75, 0x72, 0x72, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0a, 0x6f, 0x63, 0x63, 0x75,
-	0x72, 0x72, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x4e,
-	0x61, 0x6d, 0x65, 0x22, 0xa7, 0x02, 0x0a, 0x07, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x12,
-	0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12,
-	0x3d, 0x0a, 0x0c, 0x69, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
-	0x70, 0x52, 0x0b, 0x69, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x44, 0x61, 0x74, 0x65, 0x12, 0x25,
-	0x0a, 0x0e, 0x69, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x5f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0d, 0x69, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x41,
-	0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x35, 0x0a,
-	0x08, 0x64, 0x75, 0x65, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x07, 0x64, 0x75, 0x65,
-	0x44, 0x61, 0x74, 0x65, 0x12, 0x38, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x06, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76,
-	0x31, 0x2e, 0x42, 0x69, 0x6c, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x1d,
-	0x0a, 0x0a, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x5f, 0x74, 0x6f, 0x18, 0x07, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x09, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x54, 0x6f, 0x22, 0x53, 0x0a,
-	0x11, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x43, 0x61,
-	0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x72, 0x61, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x62, 0x72, 0x61, 0x6e, 0x64, 0x12, 0x28, 0x0a, 0x10, 0x6c, 0x61, 0x73, 0x74,
-	0x5f, 0x66, 0x6f, 0x75, 0x72, 0x5f, 0x64, 0x69, 0x67, 0x69, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0e, 0x6c, 0x61, 0x73, 0x74, 0x46, 0x6f, 0x75, 0x72, 0x44, 0x69, 0x67, 0x69,
-	0x74, 0x73, 0x22, 0x34, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74,
-	0x4d, 0x6f, 0x6e, 0x74, 0x68, 0x55, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x15, 0x0a, 0x06, 0x6f, 0x72, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x6f, 0x72, 0x67, 0x49, 0x64, 0x22, 0x98, 0x06, 0x0a, 0x1c, 0x47, 0x65, 0x74,
-	0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x4d, 0x6f, 0x6e, 0x74, 0x68, 0x55, 0x73, 0x61, 0x67,
-	0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x39, 0x0a, 0x0a, 0x73, 0x74, 0x61,
-	0x72, 0x74, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74,
-	0x44, 0x61, 0x74, 0x65, 0x12, 0x35, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x5f, 0x64, 0x61, 0x74, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
-	0x6d, 0x70, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x44, 0x61, 0x74, 0x65, 0x12, 0x37, 0x0a, 0x18, 0x63,
+	0x64, 0x44, 0x61, 0x74, 0x65, 0x22, 0x53, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74,
+	0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x43, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x72,
+	0x61, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x72, 0x61, 0x6e, 0x64,
+	0x12, 0x28, 0x0a, 0x10, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x66, 0x6f, 0x75, 0x72, 0x5f, 0x64, 0x69,
+	0x67, 0x69, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6c, 0x61, 0x73, 0x74,
+	0x46, 0x6f, 0x75, 0x72, 0x44, 0x69, 0x67, 0x69, 0x74, 0x73, 0x22, 0x34, 0x0a, 0x1b, 0x47, 0x65,
+	0x74, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x4d, 0x6f, 0x6e, 0x74, 0x68, 0x55, 0x73, 0x61,
+	0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x15, 0x0a, 0x06, 0x6f, 0x72, 0x67,
+	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x72, 0x67, 0x49, 0x64,
+	0x22, 0x60, 0x0a, 0x09, 0x55, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x12, 0x3f, 0x0a,
+	0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0e, 0x32, 0x1a, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e,
+	0x76, 0x31, 0x2e, 0x55, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65,
+	0x52, 0x0c, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12,
+	0x0a, 0x04, 0x63, 0x6f, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x04, 0x63, 0x6f,
+	0x73, 0x74, 0x22, 0xc6, 0x01, 0x0a, 0x1a, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x55,
+	0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x73, 0x42, 0x79, 0x53, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x12, 0x38, 0x0a, 0x0b, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70,
+	0x70, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52,
+	0x0a, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x51, 0x0a, 0x14, 0x72,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x75, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f,
+	0x73, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x76, 0x69, 0x61, 0x6d,
+	0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x55, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x73, 0x52, 0x12, 0x72, 0x65, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x55, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x73, 0x12, 0x1b,
+	0x0a, 0x09, 0x74, 0x69, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x08, 0x74, 0x69, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xcf, 0x01, 0x0a, 0x12,
+	0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x55, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x73,
+	0x74, 0x73, 0x12, 0x37, 0x0a, 0x0b, 0x75, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x73, 0x74,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61,
+	0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x52,
+	0x0a, 0x75, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x64,
+	0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x08, 0x64,
+	0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2e, 0x0a, 0x13, 0x74, 0x6f, 0x74, 0x61, 0x6c,
+	0x5f, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x01, 0x52, 0x11, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x57, 0x69, 0x74, 0x68, 0x44,
+	0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x34, 0x0a, 0x16, 0x74, 0x6f, 0x74, 0x61, 0x6c,
+	0x5f, 0x77, 0x69, 0x74, 0x68, 0x6f, 0x75, 0x74, 0x5f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x01, 0x52, 0x14, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x57, 0x69,
+	0x74, 0x68, 0x6f, 0x75, 0x74, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0xcd, 0x07,
+	0x0a, 0x1c, 0x47, 0x65, 0x74, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x4d, 0x6f, 0x6e, 0x74,
+	0x68, 0x55, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x39,
+	0x0a, 0x0a, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09,
+	0x73, 0x74, 0x61, 0x72, 0x74, 0x44, 0x61, 0x74, 0x65, 0x12, 0x35, 0x0a, 0x08, 0x65, 0x6e, 0x64,
+	0x5f, 0x64, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69,
+	0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x44, 0x61, 0x74, 0x65,
+	0x12, 0x6b, 0x0a, 0x1e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x75, 0x73, 0x61,
+	0x67, 0x65, 0x5f, 0x63, 0x6f, 0x73, 0x74, 0x73, 0x5f, 0x62, 0x79, 0x5f, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e,
+	0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x55,
+	0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x73, 0x42, 0x79, 0x53, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x52, 0x1a, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x55, 0x73, 0x61, 0x67, 0x65,
+	0x43, 0x6f, 0x73, 0x74, 0x73, 0x42, 0x79, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1a, 0x0a,
+	0x08, 0x73, 0x75, 0x62, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x01, 0x52,
+	0x08, 0x73, 0x75, 0x62, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x3b, 0x0a, 0x18, 0x63, 0x6c, 0x6f,
+	0x75, 0x64, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x61, 0x67, 0x65,
+	0x5f, 0x63, 0x6f, 0x73, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x42, 0x02, 0x18, 0x01, 0x52,
+	0x15, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x55, 0x73, 0x61,
+	0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x12, 0x37, 0x0a, 0x16, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x75,
+	0x70, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x73, 0x74,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x01, 0x42, 0x02, 0x18, 0x01, 0x52, 0x13, 0x64, 0x61, 0x74, 0x61,
+	0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x12,
+	0x35, 0x0a, 0x15, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x65, 0x67, 0x72, 0x65, 0x73, 0x5f, 0x75, 0x73,
+	0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x73, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x01, 0x42, 0x02,
+	0x18, 0x01, 0x52, 0x12, 0x64, 0x61, 0x74, 0x61, 0x45, 0x67, 0x72, 0x65, 0x73, 0x55, 0x73, 0x61,
+	0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x12, 0x3d, 0x0a, 0x19, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65,
+	0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x5f, 0x75, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63,
+	0x6f, 0x73, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x01, 0x42, 0x02, 0x18, 0x01, 0x52, 0x16, 0x72,
+	0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x55, 0x73, 0x61, 0x67,
+	0x65, 0x43, 0x6f, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x1b, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72,
+	0x64, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x5f, 0x75, 0x73, 0x61, 0x67, 0x65, 0x5f,
+	0x63, 0x6f, 0x73, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x01, 0x42, 0x02, 0x18, 0x01, 0x52, 0x18,
+	0x73, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x55,
+	0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x12, 0x2b, 0x0a, 0x0f, 0x64, 0x69, 0x73, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28,
+	0x01, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41,
+	0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x3d, 0x0a, 0x19, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x75,
+	0x73, 0x61, 0x67, 0x65, 0x5f, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75,
+	0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x01, 0x42, 0x02, 0x18, 0x01, 0x52, 0x16, 0x74, 0x6f,
+	0x74, 0x61, 0x6c, 0x55, 0x73, 0x61, 0x67, 0x65, 0x57, 0x69, 0x74, 0x68, 0x44, 0x69, 0x73, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x12, 0x43, 0x0a, 0x1c, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x75, 0x73,
+	0x61, 0x67, 0x65, 0x5f, 0x77, 0x69, 0x74, 0x68, 0x6f, 0x75, 0x74, 0x5f, 0x64, 0x69, 0x73, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x01, 0x42, 0x02, 0x18, 0x01, 0x52, 0x19,
+	0x74, 0x6f, 0x74, 0x61, 0x6c, 0x55, 0x73, 0x61, 0x67, 0x65, 0x57, 0x69, 0x74, 0x68, 0x6f, 0x75,
+	0x74, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x37, 0x0a, 0x16, 0x70, 0x65, 0x72,
+	0x5f, 0x6d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x5f, 0x75, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63,
+	0x6f, 0x73, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x01, 0x42, 0x02, 0x18, 0x01, 0x52, 0x13, 0x70,
+	0x65, 0x72, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x55, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f,
+	0x73, 0x74, 0x12, 0x51, 0x0a, 0x24, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x5f, 0x64, 0x61, 0x74,
+	0x61, 0x5f, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f,
+	0x75, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x73, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x01,
+	0x42, 0x02, 0x18, 0x01, 0x52, 0x1f, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x44, 0x61, 0x74, 0x61,
+	0x43, 0x6c, 0x6f, 0x75, 0x64, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x55, 0x73, 0x61, 0x67,
+	0x65, 0x43, 0x6f, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x1e, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x5f, 0x63,
 	0x6c, 0x6f, 0x75, 0x64, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x61,
-	0x67, 0x65, 0x5f, 0x63, 0x6f, 0x73, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x52, 0x15, 0x63,
-	0x6c, 0x6f, 0x75, 0x64, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x55, 0x73, 0x61, 0x67, 0x65,
-	0x43, 0x6f, 0x73, 0x74, 0x12, 0x33, 0x0a, 0x16, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x75, 0x70, 0x6c,
-	0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x73, 0x74, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x01, 0x52, 0x13, 0x64, 0x61, 0x74, 0x61, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64,
-	0x55, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x12, 0x31, 0x0a, 0x15, 0x64, 0x61, 0x74,
-	0x61, 0x5f, 0x65, 0x67, 0x72, 0x65, 0x73, 0x5f, 0x75, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f,
-	0x73, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x01, 0x52, 0x12, 0x64, 0x61, 0x74, 0x61, 0x45, 0x67,
-	0x72, 0x65, 0x73, 0x55, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x12, 0x39, 0x0a, 0x19,
-	0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x5f, 0x75,
-	0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x73, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x01, 0x52,
-	0x16, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x55, 0x73,
-	0x61, 0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x12, 0x3d, 0x0a, 0x1b, 0x73, 0x74, 0x61, 0x6e, 0x64,
-	0x61, 0x72, 0x64, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x5f, 0x75, 0x73, 0x61, 0x67,
-	0x65, 0x5f, 0x63, 0x6f, 0x73, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x01, 0x52, 0x18, 0x73, 0x74,
-	0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x55, 0x73, 0x61,
-	0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75,
-	0x6e, 0x74, 0x5f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x01, 0x52,
-	0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12,
-	0x39, 0x0a, 0x19, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x75, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x77,
-	0x69, 0x74, 0x68, 0x5f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01,
-	0x28, 0x01, 0x52, 0x16, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x55, 0x73, 0x61, 0x67, 0x65, 0x57, 0x69,
-	0x74, 0x68, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x3f, 0x0a, 0x1c, 0x74, 0x6f,
-	0x74, 0x61, 0x6c, 0x5f, 0x75, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x77, 0x69, 0x74, 0x68, 0x6f, 0x75,
-	0x74, 0x5f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x01,
-	0x52, 0x19, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x55, 0x73, 0x61, 0x67, 0x65, 0x57, 0x69, 0x74, 0x68,
-	0x6f, 0x75, 0x74, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x33, 0x0a, 0x16, 0x70,
-	0x65, 0x72, 0x5f, 0x6d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x5f, 0x75, 0x73, 0x61, 0x67, 0x65,
-	0x5f, 0x63, 0x6f, 0x73, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x01, 0x52, 0x13, 0x70, 0x65, 0x72,
-	0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x55, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x73, 0x74,
-	0x12, 0x4d, 0x0a, 0x24, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f,
-	0x63, 0x6c, 0x6f, 0x75, 0x64, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73,
-	0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x73, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x01, 0x52, 0x1f,
-	0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x44, 0x61, 0x74, 0x61, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x53,
-	0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x55, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x12,
-	0x42, 0x0a, 0x1e, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x5f, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x5f, 0x73,
-	0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x73,
-	0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x01, 0x52, 0x1a, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x43, 0x6c,
-	0x6f, 0x75, 0x64, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x55, 0x73, 0x61, 0x67, 0x65, 0x43,
-	0x6f, 0x73, 0x74, 0x22, 0x38, 0x0a, 0x1f, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x42, 0x69, 0x6c,
+	0x67, 0x65, 0x5f, 0x63, 0x6f, 0x73, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x01, 0x42, 0x02, 0x18,
+	0x01, 0x52, 0x1a, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x53, 0x74, 0x6f,
+	0x72, 0x61, 0x67, 0x65, 0x55, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x22, 0x38, 0x0a,
+	0x1f, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e,
+	0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x15, 0x0a, 0x06, 0x6f, 0x72, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x6f, 0x72, 0x67, 0x49, 0x64, 0x22, 0xfc, 0x01, 0x0a, 0x20, 0x47, 0x65, 0x74, 0x4f,
+	0x72, 0x67, 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x32, 0x0a, 0x04,
+	0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x76, 0x69, 0x61,
+	0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74,
+	0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65,
+	0x12, 0x23, 0x0a, 0x0d, 0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x65, 0x6d, 0x61, 0x69,
+	0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67,
+	0x45, 0x6d, 0x61, 0x69, 0x6c, 0x12, 0x3b, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70,
+	0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x74, 0x68, 0x6f,
+	0x64, 0x43, 0x61, 0x72, 0x64, 0x48, 0x00, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x88,
+	0x01, 0x01, 0x12, 0x26, 0x0a, 0x0c, 0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x74, 0x69,
+	0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0b, 0x62, 0x69, 0x6c, 0x6c,
+	0x69, 0x6e, 0x67, 0x54, 0x69, 0x65, 0x72, 0x88, 0x01, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x6d,
+	0x65, 0x74, 0x68, 0x6f, 0x64, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e,
+	0x67, 0x5f, 0x74, 0x69, 0x65, 0x72, 0x22, 0x32, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76,
+	0x6f, 0x69, 0x63, 0x65, 0x73, 0x53, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x12, 0x15, 0x0a, 0x06, 0x6f, 0x72, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x72, 0x67, 0x49, 0x64, 0x22, 0x86, 0x01, 0x0a, 0x1a, 0x47,
+	0x65, 0x74, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x73, 0x53, 0x75, 0x6d, 0x6d, 0x61, 0x72,
+	0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2f, 0x0a, 0x13, 0x6f, 0x75, 0x74,
+	0x73, 0x74, 0x61, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x01, 0x52, 0x12, 0x6f, 0x75, 0x74, 0x73, 0x74, 0x61, 0x6e, 0x64,
+	0x69, 0x6e, 0x67, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x37, 0x0a, 0x08, 0x69, 0x6e,
+	0x76, 0x6f, 0x69, 0x63, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x76,
+	0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x76, 0x6f, 0x69,
+	0x63, 0x65, 0x53, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x52, 0x08, 0x69, 0x6e, 0x76, 0x6f, 0x69,
+	0x63, 0x65, 0x73, 0x22, 0x3d, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63,
+	0x65, 0x50, 0x64, 0x66, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x15, 0x0a, 0x06, 0x6f,
+	0x72, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x72, 0x67,
+	0x49, 0x64, 0x22, 0x2d, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65,
+	0x50, 0x64, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63,
+	0x68, 0x75, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x63, 0x68, 0x75, 0x6e,
+	0x6b, 0x22, 0x7a, 0x0a, 0x1f, 0x53, 0x65, 0x6e, 0x64, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74,
+	0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x0f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72,
+	0x5f, 0x6f, 0x72, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63,
+	0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4f, 0x72, 0x67, 0x49, 0x64, 0x12, 0x2f, 0x0a, 0x14,
+	0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x5f, 0x6f, 0x72,
+	0x67, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x62, 0x69, 0x6c, 0x6c,
+	0x69, 0x6e, 0x67, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x4f, 0x72, 0x67, 0x49, 0x64, 0x22, 0x22, 0x0a,
+	0x20, 0x53, 0x65, 0x6e, 0x64, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75,
+	0x69, 0x72, 0x65, 0x64, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x2a, 0x56, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x74, 0x68,
+	0x6f, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x23, 0x0a, 0x1f, 0x50, 0x41, 0x59, 0x4d, 0x45, 0x4e,
+	0x54, 0x5f, 0x4d, 0x45, 0x54, 0x48, 0x4f, 0x44, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e,
+	0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1c, 0x0a, 0x18, 0x50,
+	0x41, 0x59, 0x4d, 0x45, 0x4e, 0x54, 0x5f, 0x4d, 0x45, 0x54, 0x48, 0x4f, 0x44, 0x5f, 0x54, 0x59,
+	0x50, 0x45, 0x5f, 0x43, 0x41, 0x52, 0x44, 0x10, 0x01, 0x2a, 0xd8, 0x02, 0x0a, 0x0d, 0x55, 0x73,
+	0x61, 0x67, 0x65, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x1b, 0x55,
+	0x53, 0x41, 0x47, 0x45, 0x5f, 0x43, 0x4f, 0x53, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55,
+	0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1f, 0x0a, 0x1b,
+	0x55, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x43, 0x4f, 0x53, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
+	0x44, 0x41, 0x54, 0x41, 0x5f, 0x55, 0x50, 0x4c, 0x4f, 0x41, 0x44, 0x10, 0x01, 0x12, 0x1f, 0x0a,
+	0x1b, 0x55, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x43, 0x4f, 0x53, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45,
+	0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x45, 0x47, 0x52, 0x45, 0x53, 0x53, 0x10, 0x02, 0x12, 0x22,
+	0x0a, 0x1e, 0x55, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x43, 0x4f, 0x53, 0x54, 0x5f, 0x54, 0x59, 0x50,
+	0x45, 0x5f, 0x52, 0x45, 0x4d, 0x4f, 0x54, 0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x52, 0x4f, 0x4c,
+	0x10, 0x03, 0x12, 0x24, 0x0a, 0x20, 0x55, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x43, 0x4f, 0x53, 0x54,
+	0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x4e, 0x44, 0x41, 0x52, 0x44, 0x5f, 0x43,
+	0x4f, 0x4d, 0x50, 0x55, 0x54, 0x45, 0x10, 0x04, 0x12, 0x21, 0x0a, 0x1d, 0x55, 0x53, 0x41, 0x47,
+	0x45, 0x5f, 0x43, 0x4f, 0x53, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x4c, 0x4f, 0x55,
+	0x44, 0x5f, 0x53, 0x54, 0x4f, 0x52, 0x41, 0x47, 0x45, 0x10, 0x05, 0x12, 0x2d, 0x0a, 0x29, 0x55,
+	0x53, 0x41, 0x47, 0x45, 0x5f, 0x43, 0x4f, 0x53, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x42,
+	0x49, 0x4e, 0x41, 0x52, 0x59, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x43, 0x4c, 0x4f, 0x55, 0x44,
+	0x5f, 0x53, 0x54, 0x4f, 0x52, 0x41, 0x47, 0x45, 0x10, 0x06, 0x12, 0x27, 0x0a, 0x23, 0x55, 0x53,
+	0x41, 0x47, 0x45, 0x5f, 0x43, 0x4f, 0x53, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4f, 0x54,
+	0x48, 0x45, 0x52, 0x5f, 0x43, 0x4c, 0x4f, 0x55, 0x44, 0x5f, 0x53, 0x54, 0x4f, 0x52, 0x41, 0x47,
+	0x45, 0x10, 0x07, 0x12, 0x1f, 0x0a, 0x1b, 0x55, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x43, 0x4f, 0x53,
+	0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x45, 0x52, 0x5f, 0x4d, 0x41, 0x43, 0x48, 0x49,
+	0x4e, 0x45, 0x10, 0x08, 0x2a, 0x58, 0x0a, 0x0a, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79,
+	0x70, 0x65, 0x12, 0x1b, 0x0a, 0x17, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50,
+	0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12,
+	0x13, 0x0a, 0x0f, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4f,
+	0x52, 0x47, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54,
+	0x59, 0x50, 0x45, 0x5f, 0x46, 0x52, 0x41, 0x47, 0x4d, 0x45, 0x4e, 0x54, 0x10, 0x02, 0x32, 0xb0,
+	0x04, 0x0a, 0x0e, 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x12, 0x6b, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x4d,
+	0x6f, 0x6e, 0x74, 0x68, 0x55, 0x73, 0x61, 0x67, 0x65, 0x12, 0x28, 0x2e, 0x76, 0x69, 0x61, 0x6d,
+	0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x75, 0x72, 0x72, 0x65,
+	0x6e, 0x74, 0x4d, 0x6f, 0x6e, 0x74, 0x68, 0x55, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76,
+	0x31, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x4d, 0x6f, 0x6e, 0x74,
+	0x68, 0x55, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x77,
+	0x0a, 0x18, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x49,
+	0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2c, 0x2e, 0x76, 0x69, 0x61,
+	0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x42,
+	0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e,
+	0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x42, 0x69, 0x6c,
 	0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x15, 0x0a, 0x06, 0x6f, 0x72, 0x67, 0x5f, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x72, 0x67, 0x49, 0x64, 0x22, 0xfc, 0x01,
-	0x0a, 0x20, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x49,
-	0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x32, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x1e, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x50,
-	0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x54, 0x79, 0x70, 0x65,
-	0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e,
-	0x67, 0x5f, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x62,
-	0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x12, 0x3b, 0x0a, 0x06, 0x6d,
-	0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x76, 0x69,
-	0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e,
-	0x74, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x43, 0x61, 0x72, 0x64, 0x48, 0x00, 0x52, 0x06, 0x6d,
-	0x65, 0x74, 0x68, 0x6f, 0x64, 0x88, 0x01, 0x01, 0x12, 0x26, 0x0a, 0x0c, 0x62, 0x69, 0x6c, 0x6c,
-	0x69, 0x6e, 0x67, 0x5f, 0x74, 0x69, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01,
-	0x52, 0x0b, 0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x54, 0x69, 0x65, 0x72, 0x88, 0x01, 0x01,
-	0x42, 0x09, 0x0a, 0x07, 0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x42, 0x0f, 0x0a, 0x0d, 0x5f,
-	0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x74, 0x69, 0x65, 0x72, 0x22, 0x32, 0x0a, 0x19,
-	0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x73, 0x53, 0x75, 0x6d, 0x6d, 0x61,
-	0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x15, 0x0a, 0x06, 0x6f, 0x72, 0x67,
-	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x72, 0x67, 0x49, 0x64,
-	0x22, 0x86, 0x01, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x73,
-	0x53, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x2f, 0x0a, 0x13, 0x6f, 0x75, 0x74, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x62,
-	0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x01, 0x52, 0x12, 0x6f, 0x75,
-	0x74, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65,
-	0x12, 0x37, 0x0a, 0x08, 0x69, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31,
-	0x2e, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x53, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x52,
-	0x08, 0x69, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x73, 0x22, 0x3d, 0x0a, 0x14, 0x47, 0x65, 0x74,
-	0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x50, 0x64, 0x66, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
-	0x64, 0x12, 0x15, 0x0a, 0x06, 0x6f, 0x72, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x6f, 0x72, 0x67, 0x49, 0x64, 0x22, 0x2d, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x49,
-	0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x50, 0x64, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c,
-	0x52, 0x05, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x22, 0x7a, 0x0a, 0x1f, 0x53, 0x65, 0x6e, 0x64, 0x50,
-	0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x45, 0x6d,
-	0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x0f, 0x63, 0x75,
-	0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x5f, 0x6f, 0x72, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4f, 0x72, 0x67,
-	0x49, 0x64, 0x12, 0x2f, 0x0a, 0x14, 0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x6f, 0x77,
-	0x6e, 0x65, 0x72, 0x5f, 0x6f, 0x72, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x11, 0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x4f, 0x72,
-	0x67, 0x49, 0x64, 0x22, 0x22, 0x0a, 0x20, 0x53, 0x65, 0x6e, 0x64, 0x50, 0x61, 0x79, 0x6d, 0x65,
-	0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2a, 0x56, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x6d, 0x65,
-	0x6e, 0x74, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x23, 0x0a, 0x1f,
-	0x50, 0x41, 0x59, 0x4d, 0x45, 0x4e, 0x54, 0x5f, 0x4d, 0x45, 0x54, 0x48, 0x4f, 0x44, 0x5f, 0x54,
-	0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10,
-	0x00, 0x12, 0x1c, 0x0a, 0x18, 0x50, 0x41, 0x59, 0x4d, 0x45, 0x4e, 0x54, 0x5f, 0x4d, 0x45, 0x54,
-	0x48, 0x4f, 0x44, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x41, 0x52, 0x44, 0x10, 0x01, 0x32,
-	0xb0, 0x04, 0x0a, 0x0e, 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x12, 0x6b, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74,
-	0x4d, 0x6f, 0x6e, 0x74, 0x68, 0x55, 0x73, 0x61, 0x67, 0x65, 0x12, 0x28, 0x2e, 0x76, 0x69, 0x61,
-	0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x75, 0x72, 0x72,
-	0x65, 0x6e, 0x74, 0x4d, 0x6f, 0x6e, 0x74, 0x68, 0x55, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e,
-	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x4d, 0x6f, 0x6e,
-	0x74, 0x68, 0x55, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x77, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67,
-	0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2c, 0x2e, 0x76, 0x69,
-	0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67,
-	0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x76, 0x69, 0x61, 0x6d,
-	0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x42, 0x69,
-	0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x65, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x49,
-	0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x73, 0x53, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x26,
-	0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
-	0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x73, 0x53, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70,
-	0x70, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x73,
-	0x53, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x58, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x50, 0x64, 0x66,
-	0x12, 0x21, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x47,
-	0x65, 0x74, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x50, 0x64, 0x66, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76,
-	0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x50, 0x64, 0x66, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x30, 0x01, 0x12, 0x77, 0x0a, 0x18, 0x53, 0x65, 0x6e,
-	0x64, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64,
-	0x45, 0x6d, 0x61, 0x69, 0x6c, 0x12, 0x2c, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70,
-	0x2e, 0x76, 0x31, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52,
-	0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76,
-	0x31, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71,
-	0x75, 0x69, 0x72, 0x65, 0x64, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x42, 0x18, 0x5a, 0x16, 0x67, 0x6f, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x63, 0x6f,
-	0x6d, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x65, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x49, 0x6e,
+	0x76, 0x6f, 0x69, 0x63, 0x65, 0x73, 0x53, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x26, 0x2e,
+	0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49,
+	0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x73, 0x53, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70,
+	0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x73, 0x53,
+	0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x58,
+	0x0a, 0x0d, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x50, 0x64, 0x66, 0x12,
+	0x21, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65,
+	0x74, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x50, 0x64, 0x66, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x22, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31,
+	0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x50, 0x64, 0x66, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x30, 0x01, 0x12, 0x77, 0x0a, 0x18, 0x53, 0x65, 0x6e, 0x64,
+	0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x45,
+	0x6d, 0x61, 0x69, 0x6c, 0x12, 0x2c, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e,
+	0x76, 0x31, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65,
+	0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31,
+	0x2e, 0x53, 0x65, 0x6e, 0x64, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75,
+	0x69, 0x72, 0x65, 0x64, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x42, 0x18, 0x5a, 0x16, 0x67, 0x6f, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1232,54 +1422,58 @@ func file_app_v1_billing_proto_rawDescGZIP() []byte {
 	return file_app_v1_billing_proto_rawDescData
 }
 
-var file_app_v1_billing_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_app_v1_billing_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
+var file_app_v1_billing_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
+var file_app_v1_billing_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
 var file_app_v1_billing_proto_goTypes = []interface{}{
 	(PaymentMethodType)(0),                   // 0: viam.app.v1.PaymentMethodType
-	(*InvoiceSummary)(nil),                   // 1: viam.app.v1.InvoiceSummary
-	(*BillableResourceEvent)(nil),            // 2: viam.app.v1.BillableResourceEvent
-	(*Invoice)(nil),                          // 3: viam.app.v1.Invoice
+	(UsageCostType)(0),                       // 1: viam.app.v1.UsageCostType
+	(SourceType)(0),                          // 2: viam.app.v1.SourceType
+	(*InvoiceSummary)(nil),                   // 3: viam.app.v1.InvoiceSummary
 	(*PaymentMethodCard)(nil),                // 4: viam.app.v1.PaymentMethodCard
 	(*GetCurrentMonthUsageRequest)(nil),      // 5: viam.app.v1.GetCurrentMonthUsageRequest
-	(*GetCurrentMonthUsageResponse)(nil),     // 6: viam.app.v1.GetCurrentMonthUsageResponse
-	(*GetOrgBillingInformationRequest)(nil),  // 7: viam.app.v1.GetOrgBillingInformationRequest
-	(*GetOrgBillingInformationResponse)(nil), // 8: viam.app.v1.GetOrgBillingInformationResponse
-	(*GetInvoicesSummaryRequest)(nil),        // 9: viam.app.v1.GetInvoicesSummaryRequest
-	(*GetInvoicesSummaryResponse)(nil),       // 10: viam.app.v1.GetInvoicesSummaryResponse
-	(*GetInvoicePdfRequest)(nil),             // 11: viam.app.v1.GetInvoicePdfRequest
-	(*GetInvoicePdfResponse)(nil),            // 12: viam.app.v1.GetInvoicePdfResponse
-	(*SendPaymentRequiredEmailRequest)(nil),  // 13: viam.app.v1.SendPaymentRequiredEmailRequest
-	(*SendPaymentRequiredEmailResponse)(nil), // 14: viam.app.v1.SendPaymentRequiredEmailResponse
-	(*timestamppb.Timestamp)(nil),            // 15: google.protobuf.Timestamp
+	(*UsageCost)(nil),                        // 6: viam.app.v1.UsageCost
+	(*ResourceUsageCostsBySource)(nil),       // 7: viam.app.v1.ResourceUsageCostsBySource
+	(*ResourceUsageCosts)(nil),               // 8: viam.app.v1.ResourceUsageCosts
+	(*GetCurrentMonthUsageResponse)(nil),     // 9: viam.app.v1.GetCurrentMonthUsageResponse
+	(*GetOrgBillingInformationRequest)(nil),  // 10: viam.app.v1.GetOrgBillingInformationRequest
+	(*GetOrgBillingInformationResponse)(nil), // 11: viam.app.v1.GetOrgBillingInformationResponse
+	(*GetInvoicesSummaryRequest)(nil),        // 12: viam.app.v1.GetInvoicesSummaryRequest
+	(*GetInvoicesSummaryResponse)(nil),       // 13: viam.app.v1.GetInvoicesSummaryResponse
+	(*GetInvoicePdfRequest)(nil),             // 14: viam.app.v1.GetInvoicePdfRequest
+	(*GetInvoicePdfResponse)(nil),            // 15: viam.app.v1.GetInvoicePdfResponse
+	(*SendPaymentRequiredEmailRequest)(nil),  // 16: viam.app.v1.SendPaymentRequiredEmailRequest
+	(*SendPaymentRequiredEmailResponse)(nil), // 17: viam.app.v1.SendPaymentRequiredEmailResponse
+	(*timestamppb.Timestamp)(nil),            // 18: google.protobuf.Timestamp
 }
 var file_app_v1_billing_proto_depIdxs = []int32{
-	15, // 0: viam.app.v1.InvoiceSummary.invoice_date:type_name -> google.protobuf.Timestamp
-	15, // 1: viam.app.v1.InvoiceSummary.due_date:type_name -> google.protobuf.Timestamp
-	15, // 2: viam.app.v1.InvoiceSummary.paid_date:type_name -> google.protobuf.Timestamp
-	15, // 3: viam.app.v1.BillableResourceEvent.occurred_at:type_name -> google.protobuf.Timestamp
-	15, // 4: viam.app.v1.Invoice.invoice_date:type_name -> google.protobuf.Timestamp
-	15, // 5: viam.app.v1.Invoice.due_date:type_name -> google.protobuf.Timestamp
-	2,  // 6: viam.app.v1.Invoice.items:type_name -> viam.app.v1.BillableResourceEvent
-	15, // 7: viam.app.v1.GetCurrentMonthUsageResponse.start_date:type_name -> google.protobuf.Timestamp
-	15, // 8: viam.app.v1.GetCurrentMonthUsageResponse.end_date:type_name -> google.protobuf.Timestamp
-	0,  // 9: viam.app.v1.GetOrgBillingInformationResponse.type:type_name -> viam.app.v1.PaymentMethodType
-	4,  // 10: viam.app.v1.GetOrgBillingInformationResponse.method:type_name -> viam.app.v1.PaymentMethodCard
-	1,  // 11: viam.app.v1.GetInvoicesSummaryResponse.invoices:type_name -> viam.app.v1.InvoiceSummary
-	5,  // 12: viam.app.v1.BillingService.GetCurrentMonthUsage:input_type -> viam.app.v1.GetCurrentMonthUsageRequest
-	7,  // 13: viam.app.v1.BillingService.GetOrgBillingInformation:input_type -> viam.app.v1.GetOrgBillingInformationRequest
-	9,  // 14: viam.app.v1.BillingService.GetInvoicesSummary:input_type -> viam.app.v1.GetInvoicesSummaryRequest
-	11, // 15: viam.app.v1.BillingService.GetInvoicePdf:input_type -> viam.app.v1.GetInvoicePdfRequest
-	13, // 16: viam.app.v1.BillingService.SendPaymentRequiredEmail:input_type -> viam.app.v1.SendPaymentRequiredEmailRequest
-	6,  // 17: viam.app.v1.BillingService.GetCurrentMonthUsage:output_type -> viam.app.v1.GetCurrentMonthUsageResponse
-	8,  // 18: viam.app.v1.BillingService.GetOrgBillingInformation:output_type -> viam.app.v1.GetOrgBillingInformationResponse
-	10, // 19: viam.app.v1.BillingService.GetInvoicesSummary:output_type -> viam.app.v1.GetInvoicesSummaryResponse
-	12, // 20: viam.app.v1.BillingService.GetInvoicePdf:output_type -> viam.app.v1.GetInvoicePdfResponse
-	14, // 21: viam.app.v1.BillingService.SendPaymentRequiredEmail:output_type -> viam.app.v1.SendPaymentRequiredEmailResponse
-	17, // [17:22] is the sub-list for method output_type
-	12, // [12:17] is the sub-list for method input_type
-	12, // [12:12] is the sub-list for extension type_name
-	12, // [12:12] is the sub-list for extension extendee
-	0,  // [0:12] is the sub-list for field type_name
+	18, // 0: viam.app.v1.InvoiceSummary.invoice_date:type_name -> google.protobuf.Timestamp
+	18, // 1: viam.app.v1.InvoiceSummary.due_date:type_name -> google.protobuf.Timestamp
+	18, // 2: viam.app.v1.InvoiceSummary.paid_date:type_name -> google.protobuf.Timestamp
+	1,  // 3: viam.app.v1.UsageCost.resource_type:type_name -> viam.app.v1.UsageCostType
+	2,  // 4: viam.app.v1.ResourceUsageCostsBySource.source_type:type_name -> viam.app.v1.SourceType
+	8,  // 5: viam.app.v1.ResourceUsageCostsBySource.resource_usage_costs:type_name -> viam.app.v1.ResourceUsageCosts
+	6,  // 6: viam.app.v1.ResourceUsageCosts.usage_costs:type_name -> viam.app.v1.UsageCost
+	18, // 7: viam.app.v1.GetCurrentMonthUsageResponse.start_date:type_name -> google.protobuf.Timestamp
+	18, // 8: viam.app.v1.GetCurrentMonthUsageResponse.end_date:type_name -> google.protobuf.Timestamp
+	7,  // 9: viam.app.v1.GetCurrentMonthUsageResponse.resource_usage_costs_by_source:type_name -> viam.app.v1.ResourceUsageCostsBySource
+	0,  // 10: viam.app.v1.GetOrgBillingInformationResponse.type:type_name -> viam.app.v1.PaymentMethodType
+	4,  // 11: viam.app.v1.GetOrgBillingInformationResponse.method:type_name -> viam.app.v1.PaymentMethodCard
+	3,  // 12: viam.app.v1.GetInvoicesSummaryResponse.invoices:type_name -> viam.app.v1.InvoiceSummary
+	5,  // 13: viam.app.v1.BillingService.GetCurrentMonthUsage:input_type -> viam.app.v1.GetCurrentMonthUsageRequest
+	10, // 14: viam.app.v1.BillingService.GetOrgBillingInformation:input_type -> viam.app.v1.GetOrgBillingInformationRequest
+	12, // 15: viam.app.v1.BillingService.GetInvoicesSummary:input_type -> viam.app.v1.GetInvoicesSummaryRequest
+	14, // 16: viam.app.v1.BillingService.GetInvoicePdf:input_type -> viam.app.v1.GetInvoicePdfRequest
+	16, // 17: viam.app.v1.BillingService.SendPaymentRequiredEmail:input_type -> viam.app.v1.SendPaymentRequiredEmailRequest
+	9,  // 18: viam.app.v1.BillingService.GetCurrentMonthUsage:output_type -> viam.app.v1.GetCurrentMonthUsageResponse
+	11, // 19: viam.app.v1.BillingService.GetOrgBillingInformation:output_type -> viam.app.v1.GetOrgBillingInformationResponse
+	13, // 20: viam.app.v1.BillingService.GetInvoicesSummary:output_type -> viam.app.v1.GetInvoicesSummaryResponse
+	15, // 21: viam.app.v1.BillingService.GetInvoicePdf:output_type -> viam.app.v1.GetInvoicePdfResponse
+	17, // 22: viam.app.v1.BillingService.SendPaymentRequiredEmail:output_type -> viam.app.v1.SendPaymentRequiredEmailResponse
+	18, // [18:23] is the sub-list for method output_type
+	13, // [13:18] is the sub-list for method input_type
+	13, // [13:13] is the sub-list for extension type_name
+	13, // [13:13] is the sub-list for extension extendee
+	0,  // [0:13] is the sub-list for field type_name
 }
 
 func init() { file_app_v1_billing_proto_init() }
@@ -1301,7 +1495,7 @@ func file_app_v1_billing_proto_init() {
 			}
 		}
 		file_app_v1_billing_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BillableResourceEvent); i {
+			switch v := v.(*PaymentMethodCard); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1313,7 +1507,7 @@ func file_app_v1_billing_proto_init() {
 			}
 		}
 		file_app_v1_billing_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Invoice); i {
+			switch v := v.(*GetCurrentMonthUsageRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1325,7 +1519,7 @@ func file_app_v1_billing_proto_init() {
 			}
 		}
 		file_app_v1_billing_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PaymentMethodCard); i {
+			switch v := v.(*UsageCost); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1337,7 +1531,7 @@ func file_app_v1_billing_proto_init() {
 			}
 		}
 		file_app_v1_billing_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetCurrentMonthUsageRequest); i {
+			switch v := v.(*ResourceUsageCostsBySource); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1349,7 +1543,7 @@ func file_app_v1_billing_proto_init() {
 			}
 		}
 		file_app_v1_billing_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetCurrentMonthUsageResponse); i {
+			switch v := v.(*ResourceUsageCosts); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1361,7 +1555,7 @@ func file_app_v1_billing_proto_init() {
 			}
 		}
 		file_app_v1_billing_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetOrgBillingInformationRequest); i {
+			switch v := v.(*GetCurrentMonthUsageResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1373,7 +1567,7 @@ func file_app_v1_billing_proto_init() {
 			}
 		}
 		file_app_v1_billing_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetOrgBillingInformationResponse); i {
+			switch v := v.(*GetOrgBillingInformationRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1385,7 +1579,7 @@ func file_app_v1_billing_proto_init() {
 			}
 		}
 		file_app_v1_billing_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetInvoicesSummaryRequest); i {
+			switch v := v.(*GetOrgBillingInformationResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1397,7 +1591,7 @@ func file_app_v1_billing_proto_init() {
 			}
 		}
 		file_app_v1_billing_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetInvoicesSummaryResponse); i {
+			switch v := v.(*GetInvoicesSummaryRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1409,7 +1603,7 @@ func file_app_v1_billing_proto_init() {
 			}
 		}
 		file_app_v1_billing_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetInvoicePdfRequest); i {
+			switch v := v.(*GetInvoicesSummaryResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1421,7 +1615,7 @@ func file_app_v1_billing_proto_init() {
 			}
 		}
 		file_app_v1_billing_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetInvoicePdfResponse); i {
+			switch v := v.(*GetInvoicePdfRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1433,7 +1627,7 @@ func file_app_v1_billing_proto_init() {
 			}
 		}
 		file_app_v1_billing_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SendPaymentRequiredEmailRequest); i {
+			switch v := v.(*GetInvoicePdfResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1445,6 +1639,18 @@ func file_app_v1_billing_proto_init() {
 			}
 		}
 		file_app_v1_billing_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SendPaymentRequiredEmailRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_app_v1_billing_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SendPaymentRequiredEmailResponse); i {
 			case 0:
 				return &v.state
@@ -1457,14 +1663,14 @@ func file_app_v1_billing_proto_init() {
 			}
 		}
 	}
-	file_app_v1_billing_proto_msgTypes[7].OneofWrappers = []interface{}{}
+	file_app_v1_billing_proto_msgTypes[8].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_app_v1_billing_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   14,
+			NumEnums:      3,
+			NumMessages:   15,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/component/audioinput/v1/audioinput.pb.gw.go b/component/audioinput/v1/audioinput.pb.gw.go
index 571f1e11f..97662546a 100644
--- a/component/audioinput/v1/audioinput.pb.gw.go
+++ b/component/audioinput/v1/audioinput.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	v1_0 "go.viam.com/api/common/v1"
+	"go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -184,7 +184,7 @@ var (
 )
 
 func request_AudioInputService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client AudioInputServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -217,7 +217,7 @@ func request_AudioInputService_DoCommand_0(ctx context.Context, marshaler runtim
 }
 
 func local_request_AudioInputService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server AudioInputServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -254,7 +254,7 @@ var (
 )
 
 func request_AudioInputService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, client AudioInputServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetGeometriesRequest
+	var protoReq v1.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -287,7 +287,7 @@ func request_AudioInputService_GetGeometries_0(ctx context.Context, marshaler ru
 }
 
 func local_request_AudioInputService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, server AudioInputServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetGeometriesRequest
+	var protoReq v1.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/component/camera/v1/camera.pb.gw.go b/component/camera/v1/camera.pb.gw.go
index b329ca959..b97fe7000 100644
--- a/component/camera/v1/camera.pb.gw.go
+++ b/component/camera/v1/camera.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	"go.viam.com/api/common/v1"
+	v1_0 "go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -351,7 +351,7 @@ var (
 )
 
 func request_CameraService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client CameraServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -384,7 +384,7 @@ func request_CameraService_DoCommand_0(ctx context.Context, marshaler runtime.Ma
 }
 
 func local_request_CameraService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server CameraServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -421,7 +421,7 @@ var (
 )
 
 func request_CameraService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, client CameraServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.GetGeometriesRequest
+	var protoReq v1_0.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -454,7 +454,7 @@ func request_CameraService_GetGeometries_0(ctx context.Context, marshaler runtim
 }
 
 func local_request_CameraService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, server CameraServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.GetGeometriesRequest
+	var protoReq v1_0.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/component/encoder/v1/encoder.pb.gw.go b/component/encoder/v1/encoder.pb.gw.go
index 4fa63db37..ef911f15d 100644
--- a/component/encoder/v1/encoder.pb.gw.go
+++ b/component/encoder/v1/encoder.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	v1_0 "go.viam.com/api/common/v1"
+	"go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -247,7 +247,7 @@ var (
 )
 
 func request_EncoderService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client EncoderServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -280,7 +280,7 @@ func request_EncoderService_DoCommand_0(ctx context.Context, marshaler runtime.M
 }
 
 func local_request_EncoderService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server EncoderServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -317,7 +317,7 @@ var (
 )
 
 func request_EncoderService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, client EncoderServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetGeometriesRequest
+	var protoReq v1.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -350,7 +350,7 @@ func request_EncoderService_GetGeometries_0(ctx context.Context, marshaler runti
 }
 
 func local_request_EncoderService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, server EncoderServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetGeometriesRequest
+	var protoReq v1.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/component/generic/v1/generic.pb.gw.go b/component/generic/v1/generic.pb.gw.go
index 8b95fb2a9..81abf78ba 100644
--- a/component/generic/v1/generic.pb.gw.go
+++ b/component/generic/v1/generic.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	"go.viam.com/api/common/v1"
+	v1_0 "go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -37,7 +37,7 @@ var (
 )
 
 func request_GenericService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client GenericServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -70,7 +70,7 @@ func request_GenericService_DoCommand_0(ctx context.Context, marshaler runtime.M
 }
 
 func local_request_GenericService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server GenericServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -107,7 +107,7 @@ var (
 )
 
 func request_GenericService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, client GenericServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.GetGeometriesRequest
+	var protoReq v1_0.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -140,7 +140,7 @@ func request_GenericService_GetGeometries_0(ctx context.Context, marshaler runti
 }
 
 func local_request_GenericService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, server GenericServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.GetGeometriesRequest
+	var protoReq v1_0.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/component/inputcontroller/v1/input_controller.pb.gw.go b/component/inputcontroller/v1/input_controller.pb.gw.go
index 199f00f1d..65d0cf631 100644
--- a/component/inputcontroller/v1/input_controller.pb.gw.go
+++ b/component/inputcontroller/v1/input_controller.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	"go.viam.com/api/common/v1"
+	v1_0 "go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -292,7 +292,7 @@ var (
 )
 
 func request_InputControllerService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client InputControllerServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -325,7 +325,7 @@ func request_InputControllerService_DoCommand_0(ctx context.Context, marshaler r
 }
 
 func local_request_InputControllerService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server InputControllerServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -362,7 +362,7 @@ var (
 )
 
 func request_InputControllerService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, client InputControllerServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.GetGeometriesRequest
+	var protoReq v1_0.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -395,7 +395,7 @@ func request_InputControllerService_GetGeometries_0(ctx context.Context, marshal
 }
 
 func local_request_InputControllerService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, server InputControllerServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.GetGeometriesRequest
+	var protoReq v1_0.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/component/motor/v1/motor.pb.gw.go b/component/motor/v1/motor.pb.gw.go
index a3e2fe669..4ac3a68d9 100644
--- a/component/motor/v1/motor.pb.gw.go
+++ b/component/motor/v1/motor.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	"go.viam.com/api/common/v1"
+	v1_0 "go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -719,7 +719,7 @@ var (
 )
 
 func request_MotorService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client MotorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -752,7 +752,7 @@ func request_MotorService_DoCommand_0(ctx context.Context, marshaler runtime.Mar
 }
 
 func local_request_MotorService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server MotorServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -789,7 +789,7 @@ var (
 )
 
 func request_MotorService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, client MotorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.GetGeometriesRequest
+	var protoReq v1_0.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -822,7 +822,7 @@ func request_MotorService_GetGeometries_0(ctx context.Context, marshaler runtime
 }
 
 func local_request_MotorService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, server MotorServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.GetGeometriesRequest
+	var protoReq v1_0.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/component/sensor/v1/sensor.pb.gw.go b/component/sensor/v1/sensor.pb.gw.go
index b45747050..66681c369 100644
--- a/component/sensor/v1/sensor.pb.gw.go
+++ b/component/sensor/v1/sensor.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	v1_0 "go.viam.com/api/common/v1"
+	"go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -37,7 +37,7 @@ var (
 )
 
 func request_SensorService_GetReadings_0(ctx context.Context, marshaler runtime.Marshaler, client SensorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetReadingsRequest
+	var protoReq v1.GetReadingsRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -70,7 +70,7 @@ func request_SensorService_GetReadings_0(ctx context.Context, marshaler runtime.
 }
 
 func local_request_SensorService_GetReadings_0(ctx context.Context, marshaler runtime.Marshaler, server SensorServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetReadingsRequest
+	var protoReq v1.GetReadingsRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -107,7 +107,7 @@ var (
 )
 
 func request_SensorService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client SensorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -140,7 +140,7 @@ func request_SensorService_DoCommand_0(ctx context.Context, marshaler runtime.Ma
 }
 
 func local_request_SensorService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server SensorServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -177,7 +177,7 @@ var (
 )
 
 func request_SensorService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, client SensorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetGeometriesRequest
+	var protoReq v1.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -210,7 +210,7 @@ func request_SensorService_GetGeometries_0(ctx context.Context, marshaler runtim
 }
 
 func local_request_SensorService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, server SensorServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetGeometriesRequest
+	var protoReq v1.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/component/servo/v1/servo.pb.gw.go b/component/servo/v1/servo.pb.gw.go
index fd6e0a9d1..75e698cc0 100644
--- a/component/servo/v1/servo.pb.gw.go
+++ b/component/servo/v1/servo.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	"go.viam.com/api/common/v1"
+	v1_0 "go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -299,7 +299,7 @@ var (
 )
 
 func request_ServoService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client ServoServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -332,7 +332,7 @@ func request_ServoService_DoCommand_0(ctx context.Context, marshaler runtime.Mar
 }
 
 func local_request_ServoService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server ServoServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -369,7 +369,7 @@ var (
 )
 
 func request_ServoService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, client ServoServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.GetGeometriesRequest
+	var protoReq v1_0.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -402,7 +402,7 @@ func request_ServoService_GetGeometries_0(ctx context.Context, marshaler runtime
 }
 
 func local_request_ServoService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, server ServoServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.GetGeometriesRequest
+	var protoReq v1_0.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/gen/js/app/v1/billing_pb.d.ts b/gen/js/app/v1/billing_pb.d.ts
index 34c7f9caa..0ddaec92a 100644
--- a/gen/js/app/v1/billing_pb.d.ts
+++ b/gen/js/app/v1/billing_pb.d.ts
@@ -50,143 +50,135 @@ export namespace InvoiceSummary {
   }
 }
 
-export class BillableResourceEvent extends jspb.Message {
-  getId(): string;
-  setId(value: string): void;
-
-  getType(): string;
-  setType(value: string): void;
-
-  getUsageQuantity(): number;
-  setUsageQuantity(value: number): void;
-
-  getUsageQuantityUnit(): string;
-  setUsageQuantityUnit(value: string): void;
-
-  getUsageCost(): string;
-  setUsageCost(value: string): void;
-
-  hasOccurredAt(): boolean;
-  clearOccurredAt(): void;
-  getOccurredAt(): google_protobuf_timestamp_pb.Timestamp | undefined;
-  setOccurredAt(value?: google_protobuf_timestamp_pb.Timestamp): void;
+export class PaymentMethodCard extends jspb.Message {
+  getBrand(): string;
+  setBrand(value: string): void;
 
-  getUserName(): string;
-  setUserName(value: string): void;
+  getLastFourDigits(): string;
+  setLastFourDigits(value: string): void;
 
   serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): BillableResourceEvent.AsObject;
-  static toObject(includeInstance: boolean, msg: BillableResourceEvent): BillableResourceEvent.AsObject;
+  toObject(includeInstance?: boolean): PaymentMethodCard.AsObject;
+  static toObject(includeInstance: boolean, msg: PaymentMethodCard): PaymentMethodCard.AsObject;
   static extensions: {[key: number]: jspb.ExtensionFieldInfo<jspb.Message>};
   static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message>};
-  static serializeBinaryToWriter(message: BillableResourceEvent, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): BillableResourceEvent;
-  static deserializeBinaryFromReader(message: BillableResourceEvent, reader: jspb.BinaryReader): BillableResourceEvent;
+  static serializeBinaryToWriter(message: PaymentMethodCard, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): PaymentMethodCard;
+  static deserializeBinaryFromReader(message: PaymentMethodCard, reader: jspb.BinaryReader): PaymentMethodCard;
 }
 
-export namespace BillableResourceEvent {
+export namespace PaymentMethodCard {
   export type AsObject = {
-    id: string,
-    type: string,
-    usageQuantity: number,
-    usageQuantityUnit: string,
-    usageCost: string,
-    occurredAt?: google_protobuf_timestamp_pb.Timestamp.AsObject,
-    userName: string,
+    brand: string,
+    lastFourDigits: string,
   }
 }
 
-export class Invoice extends jspb.Message {
-  getId(): string;
-  setId(value: string): void;
-
-  hasInvoiceDate(): boolean;
-  clearInvoiceDate(): void;
-  getInvoiceDate(): google_protobuf_timestamp_pb.Timestamp | undefined;
-  setInvoiceDate(value?: google_protobuf_timestamp_pb.Timestamp): void;
-
-  getInvoiceAmount(): number;
-  setInvoiceAmount(value: number): void;
+export class GetCurrentMonthUsageRequest extends jspb.Message {
+  getOrgId(): string;
+  setOrgId(value: string): void;
 
-  getStatus(): string;
-  setStatus(value: string): void;
+  serializeBinary(): Uint8Array;
+  toObject(includeInstance?: boolean): GetCurrentMonthUsageRequest.AsObject;
+  static toObject(includeInstance: boolean, msg: GetCurrentMonthUsageRequest): GetCurrentMonthUsageRequest.AsObject;
+  static extensions: {[key: number]: jspb.ExtensionFieldInfo<jspb.Message>};
+  static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message>};
+  static serializeBinaryToWriter(message: GetCurrentMonthUsageRequest, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): GetCurrentMonthUsageRequest;
+  static deserializeBinaryFromReader(message: GetCurrentMonthUsageRequest, reader: jspb.BinaryReader): GetCurrentMonthUsageRequest;
+}
 
-  hasDueDate(): boolean;
-  clearDueDate(): void;
-  getDueDate(): google_protobuf_timestamp_pb.Timestamp | undefined;
-  setDueDate(value?: google_protobuf_timestamp_pb.Timestamp): void;
+export namespace GetCurrentMonthUsageRequest {
+  export type AsObject = {
+    orgId: string,
+  }
+}
 
-  clearItemsList(): void;
-  getItemsList(): Array<BillableResourceEvent>;
-  setItemsList(value: Array<BillableResourceEvent>): void;
-  addItems(value?: BillableResourceEvent, index?: number): BillableResourceEvent;
+export class UsageCost extends jspb.Message {
+  getResourceType(): UsageCostTypeMap[keyof UsageCostTypeMap];
+  setResourceType(value: UsageCostTypeMap[keyof UsageCostTypeMap]): void;
 
-  getEmailedTo(): string;
-  setEmailedTo(value: string): void;
+  getCost(): number;
+  setCost(value: number): void;
 
   serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): Invoice.AsObject;
-  static toObject(includeInstance: boolean, msg: Invoice): Invoice.AsObject;
+  toObject(includeInstance?: boolean): UsageCost.AsObject;
+  static toObject(includeInstance: boolean, msg: UsageCost): UsageCost.AsObject;
   static extensions: {[key: number]: jspb.ExtensionFieldInfo<jspb.Message>};
   static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message>};
-  static serializeBinaryToWriter(message: Invoice, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): Invoice;
-  static deserializeBinaryFromReader(message: Invoice, reader: jspb.BinaryReader): Invoice;
+  static serializeBinaryToWriter(message: UsageCost, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): UsageCost;
+  static deserializeBinaryFromReader(message: UsageCost, reader: jspb.BinaryReader): UsageCost;
 }
 
-export namespace Invoice {
+export namespace UsageCost {
   export type AsObject = {
-    id: string,
-    invoiceDate?: google_protobuf_timestamp_pb.Timestamp.AsObject,
-    invoiceAmount: number,
-    status: string,
-    dueDate?: google_protobuf_timestamp_pb.Timestamp.AsObject,
-    itemsList: Array<BillableResourceEvent.AsObject>,
-    emailedTo: string,
+    resourceType: UsageCostTypeMap[keyof UsageCostTypeMap],
+    cost: number,
   }
 }
 
-export class PaymentMethodCard extends jspb.Message {
-  getBrand(): string;
-  setBrand(value: string): void;
+export class ResourceUsageCostsBySource extends jspb.Message {
+  getSourceType(): SourceTypeMap[keyof SourceTypeMap];
+  setSourceType(value: SourceTypeMap[keyof SourceTypeMap]): void;
 
-  getLastFourDigits(): string;
-  setLastFourDigits(value: string): void;
+  hasResourceUsageCosts(): boolean;
+  clearResourceUsageCosts(): void;
+  getResourceUsageCosts(): ResourceUsageCosts | undefined;
+  setResourceUsageCosts(value?: ResourceUsageCosts): void;
+
+  getTierName(): string;
+  setTierName(value: string): void;
 
   serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): PaymentMethodCard.AsObject;
-  static toObject(includeInstance: boolean, msg: PaymentMethodCard): PaymentMethodCard.AsObject;
+  toObject(includeInstance?: boolean): ResourceUsageCostsBySource.AsObject;
+  static toObject(includeInstance: boolean, msg: ResourceUsageCostsBySource): ResourceUsageCostsBySource.AsObject;
   static extensions: {[key: number]: jspb.ExtensionFieldInfo<jspb.Message>};
   static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message>};
-  static serializeBinaryToWriter(message: PaymentMethodCard, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): PaymentMethodCard;
-  static deserializeBinaryFromReader(message: PaymentMethodCard, reader: jspb.BinaryReader): PaymentMethodCard;
+  static serializeBinaryToWriter(message: ResourceUsageCostsBySource, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): ResourceUsageCostsBySource;
+  static deserializeBinaryFromReader(message: ResourceUsageCostsBySource, reader: jspb.BinaryReader): ResourceUsageCostsBySource;
 }
 
-export namespace PaymentMethodCard {
+export namespace ResourceUsageCostsBySource {
   export type AsObject = {
-    brand: string,
-    lastFourDigits: string,
+    sourceType: SourceTypeMap[keyof SourceTypeMap],
+    resourceUsageCosts?: ResourceUsageCosts.AsObject,
+    tierName: string,
   }
 }
 
-export class GetCurrentMonthUsageRequest extends jspb.Message {
-  getOrgId(): string;
-  setOrgId(value: string): void;
+export class ResourceUsageCosts extends jspb.Message {
+  clearUsageCostsList(): void;
+  getUsageCostsList(): Array<UsageCost>;
+  setUsageCostsList(value: Array<UsageCost>): void;
+  addUsageCosts(value?: UsageCost, index?: number): UsageCost;
+
+  getDiscount(): number;
+  setDiscount(value: number): void;
+
+  getTotalWithDiscount(): number;
+  setTotalWithDiscount(value: number): void;
+
+  getTotalWithoutDiscount(): number;
+  setTotalWithoutDiscount(value: number): void;
 
   serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): GetCurrentMonthUsageRequest.AsObject;
-  static toObject(includeInstance: boolean, msg: GetCurrentMonthUsageRequest): GetCurrentMonthUsageRequest.AsObject;
+  toObject(includeInstance?: boolean): ResourceUsageCosts.AsObject;
+  static toObject(includeInstance: boolean, msg: ResourceUsageCosts): ResourceUsageCosts.AsObject;
   static extensions: {[key: number]: jspb.ExtensionFieldInfo<jspb.Message>};
   static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message>};
-  static serializeBinaryToWriter(message: GetCurrentMonthUsageRequest, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): GetCurrentMonthUsageRequest;
-  static deserializeBinaryFromReader(message: GetCurrentMonthUsageRequest, reader: jspb.BinaryReader): GetCurrentMonthUsageRequest;
+  static serializeBinaryToWriter(message: ResourceUsageCosts, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): ResourceUsageCosts;
+  static deserializeBinaryFromReader(message: ResourceUsageCosts, reader: jspb.BinaryReader): ResourceUsageCosts;
 }
 
-export namespace GetCurrentMonthUsageRequest {
+export namespace ResourceUsageCosts {
   export type AsObject = {
-    orgId: string,
+    usageCostsList: Array<UsageCost.AsObject>,
+    discount: number,
+    totalWithDiscount: number,
+    totalWithoutDiscount: number,
   }
 }
 
@@ -201,6 +193,14 @@ export class GetCurrentMonthUsageResponse extends jspb.Message {
   getEndDate(): google_protobuf_timestamp_pb.Timestamp | undefined;
   setEndDate(value?: google_protobuf_timestamp_pb.Timestamp): void;
 
+  clearResourceUsageCostsBySourceList(): void;
+  getResourceUsageCostsBySourceList(): Array<ResourceUsageCostsBySource>;
+  setResourceUsageCostsBySourceList(value: Array<ResourceUsageCostsBySource>): void;
+  addResourceUsageCostsBySource(value?: ResourceUsageCostsBySource, index?: number): ResourceUsageCostsBySource;
+
+  getSubtotal(): number;
+  setSubtotal(value: number): void;
+
   getCloudStorageUsageCost(): number;
   setCloudStorageUsageCost(value: number): void;
 
@@ -248,6 +248,8 @@ export namespace GetCurrentMonthUsageResponse {
   export type AsObject = {
     startDate?: google_protobuf_timestamp_pb.Timestamp.AsObject,
     endDate?: google_protobuf_timestamp_pb.Timestamp.AsObject,
+    resourceUsageCostsBySourceList: Array<ResourceUsageCostsBySource.AsObject>,
+    subtotal: number,
     cloudStorageUsageCost: number,
     dataUploadUsageCost: number,
     dataEgresUsageCost: number,
@@ -457,3 +459,25 @@ export interface PaymentMethodTypeMap {
 
 export const PaymentMethodType: PaymentMethodTypeMap;
 
+export interface UsageCostTypeMap {
+  USAGE_COST_TYPE_UNSPECIFIED: 0;
+  USAGE_COST_TYPE_DATA_UPLOAD: 1;
+  USAGE_COST_TYPE_DATA_EGRESS: 2;
+  USAGE_COST_TYPE_REMOTE_CONTROL: 3;
+  USAGE_COST_TYPE_STANDARD_COMPUTE: 4;
+  USAGE_COST_TYPE_CLOUD_STORAGE: 5;
+  USAGE_COST_TYPE_BINARY_DATA_CLOUD_STORAGE: 6;
+  USAGE_COST_TYPE_OTHER_CLOUD_STORAGE: 7;
+  USAGE_COST_TYPE_PER_MACHINE: 8;
+}
+
+export const UsageCostType: UsageCostTypeMap;
+
+export interface SourceTypeMap {
+  SOURCE_TYPE_UNSPECIFIED: 0;
+  SOURCE_TYPE_ORG: 1;
+  SOURCE_TYPE_FRAGMENT: 2;
+}
+
+export const SourceType: SourceTypeMap;
+
diff --git a/gen/js/app/v1/billing_pb.js b/gen/js/app/v1/billing_pb.js
index e266414a6..18873586a 100644
--- a/gen/js/app/v1/billing_pb.js
+++ b/gen/js/app/v1/billing_pb.js
@@ -17,7 +17,6 @@ var global = (function() { return this || window || global || self || Function('
 
 var google_protobuf_timestamp_pb = require('google-protobuf/google/protobuf/timestamp_pb.js');
 goog.object.extend(proto, google_protobuf_timestamp_pb);
-goog.exportSymbol('proto.viam.app.v1.BillableResourceEvent', null, global);
 goog.exportSymbol('proto.viam.app.v1.GetCurrentMonthUsageRequest', null, global);
 goog.exportSymbol('proto.viam.app.v1.GetCurrentMonthUsageResponse', null, global);
 goog.exportSymbol('proto.viam.app.v1.GetInvoicePdfRequest', null, global);
@@ -26,12 +25,16 @@ goog.exportSymbol('proto.viam.app.v1.GetInvoicesSummaryRequest', null, global);
 goog.exportSymbol('proto.viam.app.v1.GetInvoicesSummaryResponse', null, global);
 goog.exportSymbol('proto.viam.app.v1.GetOrgBillingInformationRequest', null, global);
 goog.exportSymbol('proto.viam.app.v1.GetOrgBillingInformationResponse', null, global);
-goog.exportSymbol('proto.viam.app.v1.Invoice', null, global);
 goog.exportSymbol('proto.viam.app.v1.InvoiceSummary', null, global);
 goog.exportSymbol('proto.viam.app.v1.PaymentMethodCard', null, global);
 goog.exportSymbol('proto.viam.app.v1.PaymentMethodType', null, global);
+goog.exportSymbol('proto.viam.app.v1.ResourceUsageCosts', null, global);
+goog.exportSymbol('proto.viam.app.v1.ResourceUsageCostsBySource', null, global);
 goog.exportSymbol('proto.viam.app.v1.SendPaymentRequiredEmailRequest', null, global);
 goog.exportSymbol('proto.viam.app.v1.SendPaymentRequiredEmailResponse', null, global);
+goog.exportSymbol('proto.viam.app.v1.SourceType', null, global);
+goog.exportSymbol('proto.viam.app.v1.UsageCost', null, global);
+goog.exportSymbol('proto.viam.app.v1.UsageCostType', null, global);
 /**
  * Generated by JsPbCodeGenerator.
  * @param {Array=} opt_data Optional initial data array, typically from a
@@ -63,16 +66,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.viam.app.v1.BillableResourceEvent = function(opt_data) {
+proto.viam.app.v1.PaymentMethodCard = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.viam.app.v1.BillableResourceEvent, jspb.Message);
+goog.inherits(proto.viam.app.v1.PaymentMethodCard, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.viam.app.v1.BillableResourceEvent.displayName = 'proto.viam.app.v1.BillableResourceEvent';
+  proto.viam.app.v1.PaymentMethodCard.displayName = 'proto.viam.app.v1.PaymentMethodCard';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -84,16 +87,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.viam.app.v1.Invoice = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.viam.app.v1.Invoice.repeatedFields_, null);
+proto.viam.app.v1.GetCurrentMonthUsageRequest = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.viam.app.v1.Invoice, jspb.Message);
+goog.inherits(proto.viam.app.v1.GetCurrentMonthUsageRequest, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.viam.app.v1.Invoice.displayName = 'proto.viam.app.v1.Invoice';
+  proto.viam.app.v1.GetCurrentMonthUsageRequest.displayName = 'proto.viam.app.v1.GetCurrentMonthUsageRequest';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -105,16 +108,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.viam.app.v1.PaymentMethodCard = function(opt_data) {
+proto.viam.app.v1.UsageCost = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.viam.app.v1.PaymentMethodCard, jspb.Message);
+goog.inherits(proto.viam.app.v1.UsageCost, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.viam.app.v1.PaymentMethodCard.displayName = 'proto.viam.app.v1.PaymentMethodCard';
+  proto.viam.app.v1.UsageCost.displayName = 'proto.viam.app.v1.UsageCost';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -126,16 +129,37 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.viam.app.v1.GetCurrentMonthUsageRequest = function(opt_data) {
+proto.viam.app.v1.ResourceUsageCostsBySource = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.viam.app.v1.GetCurrentMonthUsageRequest, jspb.Message);
+goog.inherits(proto.viam.app.v1.ResourceUsageCostsBySource, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.viam.app.v1.GetCurrentMonthUsageRequest.displayName = 'proto.viam.app.v1.GetCurrentMonthUsageRequest';
+  proto.viam.app.v1.ResourceUsageCostsBySource.displayName = 'proto.viam.app.v1.ResourceUsageCostsBySource';
+}
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.viam.app.v1.ResourceUsageCosts = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, proto.viam.app.v1.ResourceUsageCosts.repeatedFields_, null);
+};
+goog.inherits(proto.viam.app.v1.ResourceUsageCosts, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.viam.app.v1.ResourceUsageCosts.displayName = 'proto.viam.app.v1.ResourceUsageCosts';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -148,7 +172,7 @@ if (goog.DEBUG && !COMPILED) {
  * @constructor
  */
 proto.viam.app.v1.GetCurrentMonthUsageResponse = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+  jspb.Message.initialize(this, opt_data, 0, -1, proto.viam.app.v1.GetCurrentMonthUsageResponse.repeatedFields_, null);
 };
 goog.inherits(proto.viam.app.v1.GetCurrentMonthUsageResponse, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
@@ -685,8 +709,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.viam.app.v1.BillableResourceEvent.prototype.toObject = function(opt_includeInstance) {
-  return proto.viam.app.v1.BillableResourceEvent.toObject(opt_includeInstance, this);
+proto.viam.app.v1.PaymentMethodCard.prototype.toObject = function(opt_includeInstance) {
+  return proto.viam.app.v1.PaymentMethodCard.toObject(opt_includeInstance, this);
 };
 
 
@@ -695,19 +719,14 @@ proto.viam.app.v1.BillableResourceEvent.prototype.toObject = function(opt_includ
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.viam.app.v1.BillableResourceEvent} msg The msg instance to transform.
+ * @param {!proto.viam.app.v1.PaymentMethodCard} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.viam.app.v1.BillableResourceEvent.toObject = function(includeInstance, msg) {
+proto.viam.app.v1.PaymentMethodCard.toObject = function(includeInstance, msg) {
   var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    type: jspb.Message.getFieldWithDefault(msg, 2, ""),
-    usageQuantity: jspb.Message.getFloatingPointFieldWithDefault(msg, 3, 0.0),
-    usageQuantityUnit: jspb.Message.getFieldWithDefault(msg, 4, ""),
-    usageCost: jspb.Message.getFieldWithDefault(msg, 5, ""),
-    occurredAt: (f = msg.getOccurredAt()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f),
-    userName: jspb.Message.getFieldWithDefault(msg, 7, "")
+    brand: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    lastFourDigits: jspb.Message.getFieldWithDefault(msg, 2, "")
   };
 
   if (includeInstance) {
@@ -721,23 +740,23 @@ proto.viam.app.v1.BillableResourceEvent.toObject = function(includeInstance, msg
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.viam.app.v1.BillableResourceEvent}
+ * @return {!proto.viam.app.v1.PaymentMethodCard}
  */
-proto.viam.app.v1.BillableResourceEvent.deserializeBinary = function(bytes) {
+proto.viam.app.v1.PaymentMethodCard.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.viam.app.v1.BillableResourceEvent;
-  return proto.viam.app.v1.BillableResourceEvent.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.viam.app.v1.PaymentMethodCard;
+  return proto.viam.app.v1.PaymentMethodCard.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.viam.app.v1.BillableResourceEvent} msg The message object to deserialize into.
+ * @param {!proto.viam.app.v1.PaymentMethodCard} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.viam.app.v1.BillableResourceEvent}
+ * @return {!proto.viam.app.v1.PaymentMethodCard}
  */
-proto.viam.app.v1.BillableResourceEvent.deserializeBinaryFromReader = function(msg, reader) {
+proto.viam.app.v1.PaymentMethodCard.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -746,32 +765,11 @@ proto.viam.app.v1.BillableResourceEvent.deserializeBinaryFromReader = function(m
     switch (field) {
     case 1:
       var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
+      msg.setBrand(value);
       break;
     case 2:
       var value = /** @type {string} */ (reader.readString());
-      msg.setType(value);
-      break;
-    case 3:
-      var value = /** @type {number} */ (reader.readDouble());
-      msg.setUsageQuantity(value);
-      break;
-    case 4:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setUsageQuantityUnit(value);
-      break;
-    case 5:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setUsageCost(value);
-      break;
-    case 6:
-      var value = new google_protobuf_timestamp_pb.Timestamp;
-      reader.readMessage(value,google_protobuf_timestamp_pb.Timestamp.deserializeBinaryFromReader);
-      msg.setOccurredAt(value);
-      break;
-    case 7:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setUserName(value);
+      msg.setLastFourDigits(value);
       break;
     default:
       reader.skipField();
@@ -786,9 +784,9 @@ proto.viam.app.v1.BillableResourceEvent.deserializeBinaryFromReader = function(m
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.viam.app.v1.BillableResourceEvent.prototype.serializeBinary = function() {
+proto.viam.app.v1.PaymentMethodCard.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.viam.app.v1.BillableResourceEvent.serializeBinaryToWriter(this, writer);
+  proto.viam.app.v1.PaymentMethodCard.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -796,218 +794,196 @@ proto.viam.app.v1.BillableResourceEvent.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.viam.app.v1.BillableResourceEvent} message
+ * @param {!proto.viam.app.v1.PaymentMethodCard} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.viam.app.v1.BillableResourceEvent.serializeBinaryToWriter = function(message, writer) {
+proto.viam.app.v1.PaymentMethodCard.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getId();
+  f = message.getBrand();
   if (f.length > 0) {
     writer.writeString(
       1,
       f
     );
   }
-  f = message.getType();
+  f = message.getLastFourDigits();
   if (f.length > 0) {
     writer.writeString(
       2,
       f
     );
   }
-  f = message.getUsageQuantity();
-  if (f !== 0.0) {
-    writer.writeDouble(
-      3,
-      f
-    );
-  }
-  f = message.getUsageQuantityUnit();
-  if (f.length > 0) {
-    writer.writeString(
-      4,
-      f
-    );
-  }
-  f = message.getUsageCost();
-  if (f.length > 0) {
-    writer.writeString(
-      5,
-      f
-    );
-  }
-  f = message.getOccurredAt();
-  if (f != null) {
-    writer.writeMessage(
-      6,
-      f,
-      google_protobuf_timestamp_pb.Timestamp.serializeBinaryToWriter
-    );
-  }
-  f = message.getUserName();
-  if (f.length > 0) {
-    writer.writeString(
-      7,
-      f
-    );
-  }
 };
 
 
 /**
- * optional string id = 1;
+ * optional string brand = 1;
  * @return {string}
  */
-proto.viam.app.v1.BillableResourceEvent.prototype.getId = function() {
+proto.viam.app.v1.PaymentMethodCard.prototype.getBrand = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.viam.app.v1.BillableResourceEvent} returns this
+ * @return {!proto.viam.app.v1.PaymentMethodCard} returns this
  */
-proto.viam.app.v1.BillableResourceEvent.prototype.setId = function(value) {
+proto.viam.app.v1.PaymentMethodCard.prototype.setBrand = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 
 
 /**
- * optional string type = 2;
+ * optional string last_four_digits = 2;
  * @return {string}
  */
-proto.viam.app.v1.BillableResourceEvent.prototype.getType = function() {
+proto.viam.app.v1.PaymentMethodCard.prototype.getLastFourDigits = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.viam.app.v1.BillableResourceEvent} returns this
+ * @return {!proto.viam.app.v1.PaymentMethodCard} returns this
  */
-proto.viam.app.v1.BillableResourceEvent.prototype.setType = function(value) {
+proto.viam.app.v1.PaymentMethodCard.prototype.setLastFourDigits = function(value) {
   return jspb.Message.setProto3StringField(this, 2, value);
 };
 
 
-/**
- * optional double usage_quantity = 3;
- * @return {number}
- */
-proto.viam.app.v1.BillableResourceEvent.prototype.getUsageQuantity = function() {
-  return /** @type {number} */ (jspb.Message.getFloatingPointFieldWithDefault(this, 3, 0.0));
-};
 
 
-/**
- * @param {number} value
- * @return {!proto.viam.app.v1.BillableResourceEvent} returns this
- */
-proto.viam.app.v1.BillableResourceEvent.prototype.setUsageQuantity = function(value) {
-  return jspb.Message.setProto3FloatField(this, 3, value);
-};
-
 
+if (jspb.Message.GENERATE_TO_OBJECT) {
 /**
- * optional string usage_quantity_unit = 4;
- * @return {string}
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
  */
-proto.viam.app.v1.BillableResourceEvent.prototype.getUsageQuantityUnit = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
+proto.viam.app.v1.GetCurrentMonthUsageRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.viam.app.v1.GetCurrentMonthUsageRequest.toObject(opt_includeInstance, this);
 };
 
 
 /**
- * @param {string} value
- * @return {!proto.viam.app.v1.BillableResourceEvent} returns this
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.viam.app.v1.GetCurrentMonthUsageRequest} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.viam.app.v1.BillableResourceEvent.prototype.setUsageQuantityUnit = function(value) {
-  return jspb.Message.setProto3StringField(this, 4, value);
-};
-
+proto.viam.app.v1.GetCurrentMonthUsageRequest.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    orgId: jspb.Message.getFieldWithDefault(msg, 1, "")
+  };
 
-/**
- * optional string usage_cost = 5;
- * @return {string}
- */
-proto.viam.app.v1.BillableResourceEvent.prototype.getUsageCost = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
 };
+}
 
 
 /**
- * @param {string} value
- * @return {!proto.viam.app.v1.BillableResourceEvent} returns this
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.viam.app.v1.GetCurrentMonthUsageRequest}
  */
-proto.viam.app.v1.BillableResourceEvent.prototype.setUsageCost = function(value) {
-  return jspb.Message.setProto3StringField(this, 5, value);
+proto.viam.app.v1.GetCurrentMonthUsageRequest.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.viam.app.v1.GetCurrentMonthUsageRequest;
+  return proto.viam.app.v1.GetCurrentMonthUsageRequest.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
- * optional google.protobuf.Timestamp occurred_at = 6;
- * @return {?proto.google.protobuf.Timestamp}
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.viam.app.v1.GetCurrentMonthUsageRequest} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.viam.app.v1.GetCurrentMonthUsageRequest}
  */
-proto.viam.app.v1.BillableResourceEvent.prototype.getOccurredAt = function() {
-  return /** @type{?proto.google.protobuf.Timestamp} */ (
-    jspb.Message.getWrapperField(this, google_protobuf_timestamp_pb.Timestamp, 6));
-};
-
-
-/**
- * @param {?proto.google.protobuf.Timestamp|undefined} value
- * @return {!proto.viam.app.v1.BillableResourceEvent} returns this
-*/
-proto.viam.app.v1.BillableResourceEvent.prototype.setOccurredAt = function(value) {
-  return jspb.Message.setWrapperField(this, 6, value);
+proto.viam.app.v1.GetCurrentMonthUsageRequest.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setOrgId(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
 };
 
 
 /**
- * Clears the message field making it undefined.
- * @return {!proto.viam.app.v1.BillableResourceEvent} returns this
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
  */
-proto.viam.app.v1.BillableResourceEvent.prototype.clearOccurredAt = function() {
-  return this.setOccurredAt(undefined);
+proto.viam.app.v1.GetCurrentMonthUsageRequest.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.viam.app.v1.GetCurrentMonthUsageRequest.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
 };
 
 
 /**
- * Returns whether this field is set.
- * @return {boolean}
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.viam.app.v1.GetCurrentMonthUsageRequest} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.viam.app.v1.BillableResourceEvent.prototype.hasOccurredAt = function() {
-  return jspb.Message.getField(this, 6) != null;
+proto.viam.app.v1.GetCurrentMonthUsageRequest.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getOrgId();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
 };
 
 
 /**
- * optional string user_name = 7;
+ * optional string org_id = 1;
  * @return {string}
  */
-proto.viam.app.v1.BillableResourceEvent.prototype.getUserName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, ""));
+proto.viam.app.v1.GetCurrentMonthUsageRequest.prototype.getOrgId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.viam.app.v1.BillableResourceEvent} returns this
+ * @return {!proto.viam.app.v1.GetCurrentMonthUsageRequest} returns this
  */
-proto.viam.app.v1.BillableResourceEvent.prototype.setUserName = function(value) {
-  return jspb.Message.setProto3StringField(this, 7, value);
+proto.viam.app.v1.GetCurrentMonthUsageRequest.prototype.setOrgId = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
 };
 
 
 
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.viam.app.v1.Invoice.repeatedFields_ = [6];
-
 
 
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -1023,8 +999,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.viam.app.v1.Invoice.prototype.toObject = function(opt_includeInstance) {
-  return proto.viam.app.v1.Invoice.toObject(opt_includeInstance, this);
+proto.viam.app.v1.UsageCost.prototype.toObject = function(opt_includeInstance) {
+  return proto.viam.app.v1.UsageCost.toObject(opt_includeInstance, this);
 };
 
 
@@ -1033,20 +1009,14 @@ proto.viam.app.v1.Invoice.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.viam.app.v1.Invoice} msg The msg instance to transform.
+ * @param {!proto.viam.app.v1.UsageCost} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.viam.app.v1.Invoice.toObject = function(includeInstance, msg) {
+proto.viam.app.v1.UsageCost.toObject = function(includeInstance, msg) {
   var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    invoiceDate: (f = msg.getInvoiceDate()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f),
-    invoiceAmount: jspb.Message.getFloatingPointFieldWithDefault(msg, 3, 0.0),
-    status: jspb.Message.getFieldWithDefault(msg, 4, ""),
-    dueDate: (f = msg.getDueDate()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f),
-    itemsList: jspb.Message.toObjectList(msg.getItemsList(),
-    proto.viam.app.v1.BillableResourceEvent.toObject, includeInstance),
-    emailedTo: jspb.Message.getFieldWithDefault(msg, 7, "")
+    resourceType: jspb.Message.getFieldWithDefault(msg, 1, 0),
+    cost: jspb.Message.getFloatingPointFieldWithDefault(msg, 2, 0.0)
   };
 
   if (includeInstance) {
@@ -1060,23 +1030,23 @@ proto.viam.app.v1.Invoice.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.viam.app.v1.Invoice}
+ * @return {!proto.viam.app.v1.UsageCost}
  */
-proto.viam.app.v1.Invoice.deserializeBinary = function(bytes) {
+proto.viam.app.v1.UsageCost.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.viam.app.v1.Invoice;
-  return proto.viam.app.v1.Invoice.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.viam.app.v1.UsageCost;
+  return proto.viam.app.v1.UsageCost.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.viam.app.v1.Invoice} msg The message object to deserialize into.
+ * @param {!proto.viam.app.v1.UsageCost} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.viam.app.v1.Invoice}
+ * @return {!proto.viam.app.v1.UsageCost}
  */
-proto.viam.app.v1.Invoice.deserializeBinaryFromReader = function(msg, reader) {
+proto.viam.app.v1.UsageCost.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -1084,35 +1054,12 @@ proto.viam.app.v1.Invoice.deserializeBinaryFromReader = function(msg, reader) {
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
+      var value = /** @type {!proto.viam.app.v1.UsageCostType} */ (reader.readEnum());
+      msg.setResourceType(value);
       break;
     case 2:
-      var value = new google_protobuf_timestamp_pb.Timestamp;
-      reader.readMessage(value,google_protobuf_timestamp_pb.Timestamp.deserializeBinaryFromReader);
-      msg.setInvoiceDate(value);
-      break;
-    case 3:
       var value = /** @type {number} */ (reader.readDouble());
-      msg.setInvoiceAmount(value);
-      break;
-    case 4:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setStatus(value);
-      break;
-    case 5:
-      var value = new google_protobuf_timestamp_pb.Timestamp;
-      reader.readMessage(value,google_protobuf_timestamp_pb.Timestamp.deserializeBinaryFromReader);
-      msg.setDueDate(value);
-      break;
-    case 6:
-      var value = new proto.viam.app.v1.BillableResourceEvent;
-      reader.readMessage(value,proto.viam.app.v1.BillableResourceEvent.deserializeBinaryFromReader);
-      msg.addItems(value);
-      break;
-    case 7:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setEmailedTo(value);
+      msg.setCost(value);
       break;
     default:
       reader.skipField();
@@ -1127,9 +1074,9 @@ proto.viam.app.v1.Invoice.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.viam.app.v1.Invoice.prototype.serializeBinary = function() {
+proto.viam.app.v1.UsageCost.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.viam.app.v1.Invoice.serializeBinaryToWriter(this, writer);
+  proto.viam.app.v1.UsageCost.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -1137,61 +1084,23 @@ proto.viam.app.v1.Invoice.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.viam.app.v1.Invoice} message
+ * @param {!proto.viam.app.v1.UsageCost} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.viam.app.v1.Invoice.serializeBinaryToWriter = function(message, writer) {
+proto.viam.app.v1.UsageCost.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
+  f = message.getResourceType();
+  if (f !== 0.0) {
+    writer.writeEnum(
       1,
       f
     );
   }
-  f = message.getInvoiceDate();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      google_protobuf_timestamp_pb.Timestamp.serializeBinaryToWriter
-    );
-  }
-  f = message.getInvoiceAmount();
+  f = message.getCost();
   if (f !== 0.0) {
     writer.writeDouble(
-      3,
-      f
-    );
-  }
-  f = message.getStatus();
-  if (f.length > 0) {
-    writer.writeString(
-      4,
-      f
-    );
-  }
-  f = message.getDueDate();
-  if (f != null) {
-    writer.writeMessage(
-      5,
-      f,
-      google_protobuf_timestamp_pb.Timestamp.serializeBinaryToWriter
-    );
-  }
-  f = message.getItemsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      6,
-      f,
-      proto.viam.app.v1.BillableResourceEvent.serializeBinaryToWriter
-    );
-  }
-  f = message.getEmailedTo();
-  if (f.length > 0) {
-    writer.writeString(
-      7,
+      2,
       f
     );
   }
@@ -1199,186 +1108,38 @@ proto.viam.app.v1.Invoice.serializeBinaryToWriter = function(message, writer) {
 
 
 /**
- * optional string id = 1;
- * @return {string}
- */
-proto.viam.app.v1.Invoice.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.viam.app.v1.Invoice} returns this
- */
-proto.viam.app.v1.Invoice.prototype.setId = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
-};
-
-
-/**
- * optional google.protobuf.Timestamp invoice_date = 2;
- * @return {?proto.google.protobuf.Timestamp}
+ * optional UsageCostType resource_type = 1;
+ * @return {!proto.viam.app.v1.UsageCostType}
  */
-proto.viam.app.v1.Invoice.prototype.getInvoiceDate = function() {
-  return /** @type{?proto.google.protobuf.Timestamp} */ (
-    jspb.Message.getWrapperField(this, google_protobuf_timestamp_pb.Timestamp, 2));
-};
-
-
-/**
- * @param {?proto.google.protobuf.Timestamp|undefined} value
- * @return {!proto.viam.app.v1.Invoice} returns this
-*/
-proto.viam.app.v1.Invoice.prototype.setInvoiceDate = function(value) {
-  return jspb.Message.setWrapperField(this, 2, value);
+proto.viam.app.v1.UsageCost.prototype.getResourceType = function() {
+  return /** @type {!proto.viam.app.v1.UsageCostType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
 /**
- * Clears the message field making it undefined.
- * @return {!proto.viam.app.v1.Invoice} returns this
+ * @param {!proto.viam.app.v1.UsageCostType} value
+ * @return {!proto.viam.app.v1.UsageCost} returns this
  */
-proto.viam.app.v1.Invoice.prototype.clearInvoiceDate = function() {
-  return this.setInvoiceDate(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.viam.app.v1.Invoice.prototype.hasInvoiceDate = function() {
-  return jspb.Message.getField(this, 2) != null;
+proto.viam.app.v1.UsageCost.prototype.setResourceType = function(value) {
+  return jspb.Message.setProto3EnumField(this, 1, value);
 };
 
 
 /**
- * optional double invoice_amount = 3;
+ * optional double cost = 2;
  * @return {number}
  */
-proto.viam.app.v1.Invoice.prototype.getInvoiceAmount = function() {
-  return /** @type {number} */ (jspb.Message.getFloatingPointFieldWithDefault(this, 3, 0.0));
+proto.viam.app.v1.UsageCost.prototype.getCost = function() {
+  return /** @type {number} */ (jspb.Message.getFloatingPointFieldWithDefault(this, 2, 0.0));
 };
 
 
 /**
  * @param {number} value
- * @return {!proto.viam.app.v1.Invoice} returns this
- */
-proto.viam.app.v1.Invoice.prototype.setInvoiceAmount = function(value) {
-  return jspb.Message.setProto3FloatField(this, 3, value);
-};
-
-
-/**
- * optional string status = 4;
- * @return {string}
- */
-proto.viam.app.v1.Invoice.prototype.getStatus = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.viam.app.v1.Invoice} returns this
- */
-proto.viam.app.v1.Invoice.prototype.setStatus = function(value) {
-  return jspb.Message.setProto3StringField(this, 4, value);
-};
-
-
-/**
- * optional google.protobuf.Timestamp due_date = 5;
- * @return {?proto.google.protobuf.Timestamp}
- */
-proto.viam.app.v1.Invoice.prototype.getDueDate = function() {
-  return /** @type{?proto.google.protobuf.Timestamp} */ (
-    jspb.Message.getWrapperField(this, google_protobuf_timestamp_pb.Timestamp, 5));
-};
-
-
-/**
- * @param {?proto.google.protobuf.Timestamp|undefined} value
- * @return {!proto.viam.app.v1.Invoice} returns this
-*/
-proto.viam.app.v1.Invoice.prototype.setDueDate = function(value) {
-  return jspb.Message.setWrapperField(this, 5, value);
-};
-
-
-/**
- * Clears the message field making it undefined.
- * @return {!proto.viam.app.v1.Invoice} returns this
- */
-proto.viam.app.v1.Invoice.prototype.clearDueDate = function() {
-  return this.setDueDate(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.viam.app.v1.Invoice.prototype.hasDueDate = function() {
-  return jspb.Message.getField(this, 5) != null;
-};
-
-
-/**
- * repeated BillableResourceEvent items = 6;
- * @return {!Array<!proto.viam.app.v1.BillableResourceEvent>}
- */
-proto.viam.app.v1.Invoice.prototype.getItemsList = function() {
-  return /** @type{!Array<!proto.viam.app.v1.BillableResourceEvent>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.viam.app.v1.BillableResourceEvent, 6));
-};
-
-
-/**
- * @param {!Array<!proto.viam.app.v1.BillableResourceEvent>} value
- * @return {!proto.viam.app.v1.Invoice} returns this
-*/
-proto.viam.app.v1.Invoice.prototype.setItemsList = function(value) {
-  return jspb.Message.setRepeatedWrapperField(this, 6, value);
-};
-
-
-/**
- * @param {!proto.viam.app.v1.BillableResourceEvent=} opt_value
- * @param {number=} opt_index
- * @return {!proto.viam.app.v1.BillableResourceEvent}
- */
-proto.viam.app.v1.Invoice.prototype.addItems = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 6, opt_value, proto.viam.app.v1.BillableResourceEvent, opt_index);
-};
-
-
-/**
- * Clears the list making it empty but non-null.
- * @return {!proto.viam.app.v1.Invoice} returns this
- */
-proto.viam.app.v1.Invoice.prototype.clearItemsList = function() {
-  return this.setItemsList([]);
-};
-
-
-/**
- * optional string emailed_to = 7;
- * @return {string}
- */
-proto.viam.app.v1.Invoice.prototype.getEmailedTo = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.viam.app.v1.Invoice} returns this
+ * @return {!proto.viam.app.v1.UsageCost} returns this
  */
-proto.viam.app.v1.Invoice.prototype.setEmailedTo = function(value) {
-  return jspb.Message.setProto3StringField(this, 7, value);
+proto.viam.app.v1.UsageCost.prototype.setCost = function(value) {
+  return jspb.Message.setProto3FloatField(this, 2, value);
 };
 
 
@@ -1398,8 +1159,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.viam.app.v1.PaymentMethodCard.prototype.toObject = function(opt_includeInstance) {
-  return proto.viam.app.v1.PaymentMethodCard.toObject(opt_includeInstance, this);
+proto.viam.app.v1.ResourceUsageCostsBySource.prototype.toObject = function(opt_includeInstance) {
+  return proto.viam.app.v1.ResourceUsageCostsBySource.toObject(opt_includeInstance, this);
 };
 
 
@@ -1408,14 +1169,15 @@ proto.viam.app.v1.PaymentMethodCard.prototype.toObject = function(opt_includeIns
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.viam.app.v1.PaymentMethodCard} msg The msg instance to transform.
+ * @param {!proto.viam.app.v1.ResourceUsageCostsBySource} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.viam.app.v1.PaymentMethodCard.toObject = function(includeInstance, msg) {
+proto.viam.app.v1.ResourceUsageCostsBySource.toObject = function(includeInstance, msg) {
   var f, obj = {
-    brand: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    lastFourDigits: jspb.Message.getFieldWithDefault(msg, 2, "")
+    sourceType: jspb.Message.getFieldWithDefault(msg, 1, 0),
+    resourceUsageCosts: (f = msg.getResourceUsageCosts()) && proto.viam.app.v1.ResourceUsageCosts.toObject(includeInstance, f),
+    tierName: jspb.Message.getFieldWithDefault(msg, 3, "")
   };
 
   if (includeInstance) {
@@ -1429,23 +1191,23 @@ proto.viam.app.v1.PaymentMethodCard.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.viam.app.v1.PaymentMethodCard}
+ * @return {!proto.viam.app.v1.ResourceUsageCostsBySource}
  */
-proto.viam.app.v1.PaymentMethodCard.deserializeBinary = function(bytes) {
+proto.viam.app.v1.ResourceUsageCostsBySource.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.viam.app.v1.PaymentMethodCard;
-  return proto.viam.app.v1.PaymentMethodCard.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.viam.app.v1.ResourceUsageCostsBySource;
+  return proto.viam.app.v1.ResourceUsageCostsBySource.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.viam.app.v1.PaymentMethodCard} msg The message object to deserialize into.
+ * @param {!proto.viam.app.v1.ResourceUsageCostsBySource} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.viam.app.v1.PaymentMethodCard}
+ * @return {!proto.viam.app.v1.ResourceUsageCostsBySource}
  */
-proto.viam.app.v1.PaymentMethodCard.deserializeBinaryFromReader = function(msg, reader) {
+proto.viam.app.v1.ResourceUsageCostsBySource.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -1453,12 +1215,17 @@ proto.viam.app.v1.PaymentMethodCard.deserializeBinaryFromReader = function(msg,
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setBrand(value);
+      var value = /** @type {!proto.viam.app.v1.SourceType} */ (reader.readEnum());
+      msg.setSourceType(value);
       break;
     case 2:
+      var value = new proto.viam.app.v1.ResourceUsageCosts;
+      reader.readMessage(value,proto.viam.app.v1.ResourceUsageCosts.deserializeBinaryFromReader);
+      msg.setResourceUsageCosts(value);
+      break;
+    case 3:
       var value = /** @type {string} */ (reader.readString());
-      msg.setLastFourDigits(value);
+      msg.setTierName(value);
       break;
     default:
       reader.skipField();
@@ -1473,9 +1240,9 @@ proto.viam.app.v1.PaymentMethodCard.deserializeBinaryFromReader = function(msg,
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.viam.app.v1.PaymentMethodCard.prototype.serializeBinary = function() {
+proto.viam.app.v1.ResourceUsageCostsBySource.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.viam.app.v1.PaymentMethodCard.serializeBinaryToWriter(this, writer);
+  proto.viam.app.v1.ResourceUsageCostsBySource.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -1483,23 +1250,31 @@ proto.viam.app.v1.PaymentMethodCard.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.viam.app.v1.PaymentMethodCard} message
+ * @param {!proto.viam.app.v1.ResourceUsageCostsBySource} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.viam.app.v1.PaymentMethodCard.serializeBinaryToWriter = function(message, writer) {
+proto.viam.app.v1.ResourceUsageCostsBySource.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getBrand();
-  if (f.length > 0) {
-    writer.writeString(
+  f = message.getSourceType();
+  if (f !== 0.0) {
+    writer.writeEnum(
       1,
       f
     );
   }
-  f = message.getLastFourDigits();
+  f = message.getResourceUsageCosts();
+  if (f != null) {
+    writer.writeMessage(
+      2,
+      f,
+      proto.viam.app.v1.ResourceUsageCosts.serializeBinaryToWriter
+    );
+  }
+  f = message.getTierName();
   if (f.length > 0) {
     writer.writeString(
-      2,
+      3,
       f
     );
   }
@@ -1507,42 +1282,86 @@ proto.viam.app.v1.PaymentMethodCard.serializeBinaryToWriter = function(message,
 
 
 /**
- * optional string brand = 1;
- * @return {string}
+ * optional SourceType source_type = 1;
+ * @return {!proto.viam.app.v1.SourceType}
  */
-proto.viam.app.v1.PaymentMethodCard.prototype.getBrand = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+proto.viam.app.v1.ResourceUsageCostsBySource.prototype.getSourceType = function() {
+  return /** @type {!proto.viam.app.v1.SourceType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
 /**
- * @param {string} value
- * @return {!proto.viam.app.v1.PaymentMethodCard} returns this
+ * @param {!proto.viam.app.v1.SourceType} value
+ * @return {!proto.viam.app.v1.ResourceUsageCostsBySource} returns this
  */
-proto.viam.app.v1.PaymentMethodCard.prototype.setBrand = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
+proto.viam.app.v1.ResourceUsageCostsBySource.prototype.setSourceType = function(value) {
+  return jspb.Message.setProto3EnumField(this, 1, value);
 };
 
 
 /**
- * optional string last_four_digits = 2;
+ * optional ResourceUsageCosts resource_usage_costs = 2;
+ * @return {?proto.viam.app.v1.ResourceUsageCosts}
+ */
+proto.viam.app.v1.ResourceUsageCostsBySource.prototype.getResourceUsageCosts = function() {
+  return /** @type{?proto.viam.app.v1.ResourceUsageCosts} */ (
+    jspb.Message.getWrapperField(this, proto.viam.app.v1.ResourceUsageCosts, 2));
+};
+
+
+/**
+ * @param {?proto.viam.app.v1.ResourceUsageCosts|undefined} value
+ * @return {!proto.viam.app.v1.ResourceUsageCostsBySource} returns this
+*/
+proto.viam.app.v1.ResourceUsageCostsBySource.prototype.setResourceUsageCosts = function(value) {
+  return jspb.Message.setWrapperField(this, 2, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.viam.app.v1.ResourceUsageCostsBySource} returns this
+ */
+proto.viam.app.v1.ResourceUsageCostsBySource.prototype.clearResourceUsageCosts = function() {
+  return this.setResourceUsageCosts(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.viam.app.v1.ResourceUsageCostsBySource.prototype.hasResourceUsageCosts = function() {
+  return jspb.Message.getField(this, 2) != null;
+};
+
+
+/**
+ * optional string tier_name = 3;
  * @return {string}
  */
-proto.viam.app.v1.PaymentMethodCard.prototype.getLastFourDigits = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
+proto.viam.app.v1.ResourceUsageCostsBySource.prototype.getTierName = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.viam.app.v1.PaymentMethodCard} returns this
+ * @return {!proto.viam.app.v1.ResourceUsageCostsBySource} returns this
  */
-proto.viam.app.v1.PaymentMethodCard.prototype.setLastFourDigits = function(value) {
-  return jspb.Message.setProto3StringField(this, 2, value);
+proto.viam.app.v1.ResourceUsageCostsBySource.prototype.setTierName = function(value) {
+  return jspb.Message.setProto3StringField(this, 3, value);
 };
 
 
 
+/**
+ * List of repeated fields within this message type.
+ * @private {!Array<number>}
+ * @const
+ */
+proto.viam.app.v1.ResourceUsageCosts.repeatedFields_ = [1];
+
 
 
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -1558,8 +1377,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.viam.app.v1.GetCurrentMonthUsageRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.viam.app.v1.GetCurrentMonthUsageRequest.toObject(opt_includeInstance, this);
+proto.viam.app.v1.ResourceUsageCosts.prototype.toObject = function(opt_includeInstance) {
+  return proto.viam.app.v1.ResourceUsageCosts.toObject(opt_includeInstance, this);
 };
 
 
@@ -1568,13 +1387,17 @@ proto.viam.app.v1.GetCurrentMonthUsageRequest.prototype.toObject = function(opt_
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.viam.app.v1.GetCurrentMonthUsageRequest} msg The msg instance to transform.
+ * @param {!proto.viam.app.v1.ResourceUsageCosts} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.viam.app.v1.GetCurrentMonthUsageRequest.toObject = function(includeInstance, msg) {
+proto.viam.app.v1.ResourceUsageCosts.toObject = function(includeInstance, msg) {
   var f, obj = {
-    orgId: jspb.Message.getFieldWithDefault(msg, 1, "")
+    usageCostsList: jspb.Message.toObjectList(msg.getUsageCostsList(),
+    proto.viam.app.v1.UsageCost.toObject, includeInstance),
+    discount: jspb.Message.getFloatingPointFieldWithDefault(msg, 2, 0.0),
+    totalWithDiscount: jspb.Message.getFloatingPointFieldWithDefault(msg, 3, 0.0),
+    totalWithoutDiscount: jspb.Message.getFloatingPointFieldWithDefault(msg, 4, 0.0)
   };
 
   if (includeInstance) {
@@ -1588,23 +1411,23 @@ proto.viam.app.v1.GetCurrentMonthUsageRequest.toObject = function(includeInstanc
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.viam.app.v1.GetCurrentMonthUsageRequest}
+ * @return {!proto.viam.app.v1.ResourceUsageCosts}
  */
-proto.viam.app.v1.GetCurrentMonthUsageRequest.deserializeBinary = function(bytes) {
+proto.viam.app.v1.ResourceUsageCosts.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.viam.app.v1.GetCurrentMonthUsageRequest;
-  return proto.viam.app.v1.GetCurrentMonthUsageRequest.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.viam.app.v1.ResourceUsageCosts;
+  return proto.viam.app.v1.ResourceUsageCosts.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.viam.app.v1.GetCurrentMonthUsageRequest} msg The message object to deserialize into.
+ * @param {!proto.viam.app.v1.ResourceUsageCosts} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.viam.app.v1.GetCurrentMonthUsageRequest}
+ * @return {!proto.viam.app.v1.ResourceUsageCosts}
  */
-proto.viam.app.v1.GetCurrentMonthUsageRequest.deserializeBinaryFromReader = function(msg, reader) {
+proto.viam.app.v1.ResourceUsageCosts.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -1612,8 +1435,21 @@ proto.viam.app.v1.GetCurrentMonthUsageRequest.deserializeBinaryFromReader = func
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setOrgId(value);
+      var value = new proto.viam.app.v1.UsageCost;
+      reader.readMessage(value,proto.viam.app.v1.UsageCost.deserializeBinaryFromReader);
+      msg.addUsageCosts(value);
+      break;
+    case 2:
+      var value = /** @type {number} */ (reader.readDouble());
+      msg.setDiscount(value);
+      break;
+    case 3:
+      var value = /** @type {number} */ (reader.readDouble());
+      msg.setTotalWithDiscount(value);
+      break;
+    case 4:
+      var value = /** @type {number} */ (reader.readDouble());
+      msg.setTotalWithoutDiscount(value);
       break;
     default:
       reader.skipField();
@@ -1628,9 +1464,9 @@ proto.viam.app.v1.GetCurrentMonthUsageRequest.deserializeBinaryFromReader = func
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.viam.app.v1.GetCurrentMonthUsageRequest.prototype.serializeBinary = function() {
+proto.viam.app.v1.ResourceUsageCosts.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.viam.app.v1.GetCurrentMonthUsageRequest.serializeBinaryToWriter(this, writer);
+  proto.viam.app.v1.ResourceUsageCosts.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -1638,16 +1474,38 @@ proto.viam.app.v1.GetCurrentMonthUsageRequest.prototype.serializeBinary = functi
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.viam.app.v1.GetCurrentMonthUsageRequest} message
+ * @param {!proto.viam.app.v1.ResourceUsageCosts} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.viam.app.v1.GetCurrentMonthUsageRequest.serializeBinaryToWriter = function(message, writer) {
+proto.viam.app.v1.ResourceUsageCosts.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getOrgId();
+  f = message.getUsageCostsList();
   if (f.length > 0) {
-    writer.writeString(
+    writer.writeRepeatedMessage(
       1,
+      f,
+      proto.viam.app.v1.UsageCost.serializeBinaryToWriter
+    );
+  }
+  f = message.getDiscount();
+  if (f !== 0.0) {
+    writer.writeDouble(
+      2,
+      f
+    );
+  }
+  f = message.getTotalWithDiscount();
+  if (f !== 0.0) {
+    writer.writeDouble(
+      3,
+      f
+    );
+  }
+  f = message.getTotalWithoutDiscount();
+  if (f !== 0.0) {
+    writer.writeDouble(
+      4,
       f
     );
   }
@@ -1655,23 +1513,104 @@ proto.viam.app.v1.GetCurrentMonthUsageRequest.serializeBinaryToWriter = function
 
 
 /**
- * optional string org_id = 1;
- * @return {string}
+ * repeated UsageCost usage_costs = 1;
+ * @return {!Array<!proto.viam.app.v1.UsageCost>}
  */
-proto.viam.app.v1.GetCurrentMonthUsageRequest.prototype.getOrgId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+proto.viam.app.v1.ResourceUsageCosts.prototype.getUsageCostsList = function() {
+  return /** @type{!Array<!proto.viam.app.v1.UsageCost>} */ (
+    jspb.Message.getRepeatedWrapperField(this, proto.viam.app.v1.UsageCost, 1));
 };
 
 
 /**
- * @param {string} value
- * @return {!proto.viam.app.v1.GetCurrentMonthUsageRequest} returns this
+ * @param {!Array<!proto.viam.app.v1.UsageCost>} value
+ * @return {!proto.viam.app.v1.ResourceUsageCosts} returns this
+*/
+proto.viam.app.v1.ResourceUsageCosts.prototype.setUsageCostsList = function(value) {
+  return jspb.Message.setRepeatedWrapperField(this, 1, value);
+};
+
+
+/**
+ * @param {!proto.viam.app.v1.UsageCost=} opt_value
+ * @param {number=} opt_index
+ * @return {!proto.viam.app.v1.UsageCost}
  */
-proto.viam.app.v1.GetCurrentMonthUsageRequest.prototype.setOrgId = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
+proto.viam.app.v1.ResourceUsageCosts.prototype.addUsageCosts = function(opt_value, opt_index) {
+  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.viam.app.v1.UsageCost, opt_index);
+};
+
+
+/**
+ * Clears the list making it empty but non-null.
+ * @return {!proto.viam.app.v1.ResourceUsageCosts} returns this
+ */
+proto.viam.app.v1.ResourceUsageCosts.prototype.clearUsageCostsList = function() {
+  return this.setUsageCostsList([]);
+};
+
+
+/**
+ * optional double discount = 2;
+ * @return {number}
+ */
+proto.viam.app.v1.ResourceUsageCosts.prototype.getDiscount = function() {
+  return /** @type {number} */ (jspb.Message.getFloatingPointFieldWithDefault(this, 2, 0.0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.viam.app.v1.ResourceUsageCosts} returns this
+ */
+proto.viam.app.v1.ResourceUsageCosts.prototype.setDiscount = function(value) {
+  return jspb.Message.setProto3FloatField(this, 2, value);
+};
+
+
+/**
+ * optional double total_with_discount = 3;
+ * @return {number}
+ */
+proto.viam.app.v1.ResourceUsageCosts.prototype.getTotalWithDiscount = function() {
+  return /** @type {number} */ (jspb.Message.getFloatingPointFieldWithDefault(this, 3, 0.0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.viam.app.v1.ResourceUsageCosts} returns this
+ */
+proto.viam.app.v1.ResourceUsageCosts.prototype.setTotalWithDiscount = function(value) {
+  return jspb.Message.setProto3FloatField(this, 3, value);
 };
 
 
+/**
+ * optional double total_without_discount = 4;
+ * @return {number}
+ */
+proto.viam.app.v1.ResourceUsageCosts.prototype.getTotalWithoutDiscount = function() {
+  return /** @type {number} */ (jspb.Message.getFloatingPointFieldWithDefault(this, 4, 0.0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.viam.app.v1.ResourceUsageCosts} returns this
+ */
+proto.viam.app.v1.ResourceUsageCosts.prototype.setTotalWithoutDiscount = function(value) {
+  return jspb.Message.setProto3FloatField(this, 4, value);
+};
+
+
+
+/**
+ * List of repeated fields within this message type.
+ * @private {!Array<number>}
+ * @const
+ */
+proto.viam.app.v1.GetCurrentMonthUsageResponse.repeatedFields_ = [14];
 
 
 
@@ -1706,6 +1645,9 @@ proto.viam.app.v1.GetCurrentMonthUsageResponse.toObject = function(includeInstan
   var f, obj = {
     startDate: (f = msg.getStartDate()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f),
     endDate: (f = msg.getEndDate()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f),
+    resourceUsageCostsBySourceList: jspb.Message.toObjectList(msg.getResourceUsageCostsBySourceList(),
+    proto.viam.app.v1.ResourceUsageCostsBySource.toObject, includeInstance),
+    subtotal: jspb.Message.getFloatingPointFieldWithDefault(msg, 15, 0.0),
     cloudStorageUsageCost: jspb.Message.getFloatingPointFieldWithDefault(msg, 3, 0.0),
     dataUploadUsageCost: jspb.Message.getFloatingPointFieldWithDefault(msg, 4, 0.0),
     dataEgresUsageCost: jspb.Message.getFloatingPointFieldWithDefault(msg, 5, 0.0),
@@ -1763,6 +1705,15 @@ proto.viam.app.v1.GetCurrentMonthUsageResponse.deserializeBinaryFromReader = fun
       reader.readMessage(value,google_protobuf_timestamp_pb.Timestamp.deserializeBinaryFromReader);
       msg.setEndDate(value);
       break;
+    case 14:
+      var value = new proto.viam.app.v1.ResourceUsageCostsBySource;
+      reader.readMessage(value,proto.viam.app.v1.ResourceUsageCostsBySource.deserializeBinaryFromReader);
+      msg.addResourceUsageCostsBySource(value);
+      break;
+    case 15:
+      var value = /** @type {number} */ (reader.readDouble());
+      msg.setSubtotal(value);
+      break;
     case 3:
       var value = /** @type {number} */ (reader.readDouble());
       msg.setCloudStorageUsageCost(value);
@@ -1852,6 +1803,21 @@ proto.viam.app.v1.GetCurrentMonthUsageResponse.serializeBinaryToWriter = functio
       google_protobuf_timestamp_pb.Timestamp.serializeBinaryToWriter
     );
   }
+  f = message.getResourceUsageCostsBySourceList();
+  if (f.length > 0) {
+    writer.writeRepeatedMessage(
+      14,
+      f,
+      proto.viam.app.v1.ResourceUsageCostsBySource.serializeBinaryToWriter
+    );
+  }
+  f = message.getSubtotal();
+  if (f !== 0.0) {
+    writer.writeDouble(
+      15,
+      f
+    );
+  }
   f = message.getCloudStorageUsageCost();
   if (f !== 0.0) {
     writer.writeDouble(
@@ -2006,6 +1972,62 @@ proto.viam.app.v1.GetCurrentMonthUsageResponse.prototype.hasEndDate = function()
 };
 
 
+/**
+ * repeated ResourceUsageCostsBySource resource_usage_costs_by_source = 14;
+ * @return {!Array<!proto.viam.app.v1.ResourceUsageCostsBySource>}
+ */
+proto.viam.app.v1.GetCurrentMonthUsageResponse.prototype.getResourceUsageCostsBySourceList = function() {
+  return /** @type{!Array<!proto.viam.app.v1.ResourceUsageCostsBySource>} */ (
+    jspb.Message.getRepeatedWrapperField(this, proto.viam.app.v1.ResourceUsageCostsBySource, 14));
+};
+
+
+/**
+ * @param {!Array<!proto.viam.app.v1.ResourceUsageCostsBySource>} value
+ * @return {!proto.viam.app.v1.GetCurrentMonthUsageResponse} returns this
+*/
+proto.viam.app.v1.GetCurrentMonthUsageResponse.prototype.setResourceUsageCostsBySourceList = function(value) {
+  return jspb.Message.setRepeatedWrapperField(this, 14, value);
+};
+
+
+/**
+ * @param {!proto.viam.app.v1.ResourceUsageCostsBySource=} opt_value
+ * @param {number=} opt_index
+ * @return {!proto.viam.app.v1.ResourceUsageCostsBySource}
+ */
+proto.viam.app.v1.GetCurrentMonthUsageResponse.prototype.addResourceUsageCostsBySource = function(opt_value, opt_index) {
+  return jspb.Message.addToRepeatedWrapperField(this, 14, opt_value, proto.viam.app.v1.ResourceUsageCostsBySource, opt_index);
+};
+
+
+/**
+ * Clears the list making it empty but non-null.
+ * @return {!proto.viam.app.v1.GetCurrentMonthUsageResponse} returns this
+ */
+proto.viam.app.v1.GetCurrentMonthUsageResponse.prototype.clearResourceUsageCostsBySourceList = function() {
+  return this.setResourceUsageCostsBySourceList([]);
+};
+
+
+/**
+ * optional double subtotal = 15;
+ * @return {number}
+ */
+proto.viam.app.v1.GetCurrentMonthUsageResponse.prototype.getSubtotal = function() {
+  return /** @type {number} */ (jspb.Message.getFloatingPointFieldWithDefault(this, 15, 0.0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.viam.app.v1.GetCurrentMonthUsageResponse} returns this
+ */
+proto.viam.app.v1.GetCurrentMonthUsageResponse.prototype.setSubtotal = function(value) {
+  return jspb.Message.setProto3FloatField(this, 15, value);
+};
+
+
 /**
  * optional double cloud_storage_usage_cost = 3;
  * @return {number}
@@ -3496,4 +3518,28 @@ proto.viam.app.v1.PaymentMethodType = {
   PAYMENT_METHOD_TYPE_CARD: 1
 };
 
+/**
+ * @enum {number}
+ */
+proto.viam.app.v1.UsageCostType = {
+  USAGE_COST_TYPE_UNSPECIFIED: 0,
+  USAGE_COST_TYPE_DATA_UPLOAD: 1,
+  USAGE_COST_TYPE_DATA_EGRESS: 2,
+  USAGE_COST_TYPE_REMOTE_CONTROL: 3,
+  USAGE_COST_TYPE_STANDARD_COMPUTE: 4,
+  USAGE_COST_TYPE_CLOUD_STORAGE: 5,
+  USAGE_COST_TYPE_BINARY_DATA_CLOUD_STORAGE: 6,
+  USAGE_COST_TYPE_OTHER_CLOUD_STORAGE: 7,
+  USAGE_COST_TYPE_PER_MACHINE: 8
+};
+
+/**
+ * @enum {number}
+ */
+proto.viam.app.v1.SourceType = {
+  SOURCE_TYPE_UNSPECIFIED: 0,
+  SOURCE_TYPE_ORG: 1,
+  SOURCE_TYPE_FRAGMENT: 2
+};
+
 goog.object.extend(exports, proto.viam.app.v1);
diff --git a/proto/viam/app/v1/billing.proto b/proto/viam/app/v1/billing.proto
index 07ee9f8db..b3b426d4b 100644
--- a/proto/viam/app/v1/billing.proto
+++ b/proto/viam/app/v1/billing.proto
@@ -28,26 +28,6 @@ message InvoiceSummary {
   google.protobuf.Timestamp paid_date = 6;
 }
 
-message BillableResourceEvent {
-  string id = 1;
-  string type = 2;
-  double usage_quantity = 3;
-  string usage_quantity_unit = 4;
-  string usage_cost = 5;
-  google.protobuf.Timestamp occurred_at = 6;
-  string user_name = 7;
-}
-
-message Invoice {
-  string id = 1;
-  google.protobuf.Timestamp invoice_date = 2;
-  double invoice_amount = 3;
-  string status = 4;
-  google.protobuf.Timestamp due_date = 5;
-  repeated BillableResourceEvent items = 6;
-  string emailed_to = 7;
-}
-
 enum PaymentMethodType {
   PAYMENT_METHOD_TYPE_UNSPECIFIED = 0;
   PAYMENT_METHOD_TYPE_CARD = 1;
@@ -62,20 +42,60 @@ message GetCurrentMonthUsageRequest {
   string org_id = 1;
 }
 
+enum UsageCostType {
+  USAGE_COST_TYPE_UNSPECIFIED = 0;
+  USAGE_COST_TYPE_DATA_UPLOAD = 1;
+  USAGE_COST_TYPE_DATA_EGRESS = 2;
+  USAGE_COST_TYPE_REMOTE_CONTROL = 3;
+  USAGE_COST_TYPE_STANDARD_COMPUTE = 4;
+  USAGE_COST_TYPE_CLOUD_STORAGE = 5;
+  USAGE_COST_TYPE_BINARY_DATA_CLOUD_STORAGE = 6;
+  USAGE_COST_TYPE_OTHER_CLOUD_STORAGE = 7;
+  USAGE_COST_TYPE_PER_MACHINE = 8;
+}
+
+enum SourceType {
+  SOURCE_TYPE_UNSPECIFIED = 0;
+  SOURCE_TYPE_ORG = 1;
+  SOURCE_TYPE_FRAGMENT = 2;
+}
+
+message UsageCost {
+  UsageCostType resource_type = 1;
+  double cost = 2;
+}
+
+message ResourceUsageCostsBySource {
+  SourceType source_type = 1;
+  ResourceUsageCosts resource_usage_costs = 2;
+  string tier_name = 3;
+}
+
+message ResourceUsageCosts {
+  repeated UsageCost usage_costs = 1;
+  double discount = 2;
+  double total_with_discount = 3;
+  double total_without_discount = 4;
+}
+
 message GetCurrentMonthUsageResponse {
   google.protobuf.Timestamp start_date = 1;
   google.protobuf.Timestamp end_date = 2;
-  double cloud_storage_usage_cost = 3;
-  double data_upload_usage_cost = 4;
-  double data_egres_usage_cost = 5;
-  double remote_control_usage_cost = 6;
-  double standard_compute_usage_cost = 7;
-  double discount_amount = 8;
-  double total_usage_with_discount = 9;
-  double total_usage_without_discount = 10;
-  double per_machine_usage_cost = 11;
-  double binary_data_cloud_storage_usage_cost = 12;
-  double other_cloud_storage_usage_cost = 13;
+  repeated ResourceUsageCostsBySource resource_usage_costs_by_source = 14;
+  double subtotal = 15;
+
+  // all fields below are deprecated
+  double cloud_storage_usage_cost = 3 [deprecated = true];
+  double data_upload_usage_cost = 4 [deprecated = true];
+  double data_egres_usage_cost = 5 [deprecated = true];
+  double remote_control_usage_cost = 6 [deprecated = true];
+  double standard_compute_usage_cost = 7 [deprecated = true];
+  double discount_amount = 8 [deprecated = true];
+  double total_usage_with_discount = 9 [deprecated = true];
+  double total_usage_without_discount = 10 [deprecated = true];
+  double per_machine_usage_cost = 11 [deprecated = true];
+  double binary_data_cloud_storage_usage_cost = 12 [deprecated = true];
+  double other_cloud_storage_usage_cost = 13 [deprecated = true];
 }
 
 message GetOrgBillingInformationRequest {
diff --git a/service/motion/v1/motion.pb.gw.go b/service/motion/v1/motion.pb.gw.go
index 64bb4bed0..1b1262cea 100644
--- a/service/motion/v1/motion.pb.gw.go
+++ b/service/motion/v1/motion.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	"go.viam.com/api/common/v1"
+	v1_0 "go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -527,7 +527,7 @@ var (
 )
 
 func request_MotionService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client MotionServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -560,7 +560,7 @@ func request_MotionService_DoCommand_0(ctx context.Context, marshaler runtime.Ma
 }
 
 func local_request_MotionService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server MotionServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/service/sensors/v1/sensors.pb.gw.go b/service/sensors/v1/sensors.pb.gw.go
index b0c69d02f..9fc2a2808 100644
--- a/service/sensors/v1/sensors.pb.gw.go
+++ b/service/sensors/v1/sensors.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	"go.viam.com/api/common/v1"
+	v1_0 "go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -177,7 +177,7 @@ var (
 )
 
 func request_SensorsService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client SensorsServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -210,7 +210,7 @@ func request_SensorsService_DoCommand_0(ctx context.Context, marshaler runtime.M
 }
 
 func local_request_SensorsService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server SensorsServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/service/slam/v1/slam.pb.gw.go b/service/slam/v1/slam.pb.gw.go
index afa099e21..48ac2664d 100644
--- a/service/slam/v1/slam.pb.gw.go
+++ b/service/slam/v1/slam.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	v1_0 "go.viam.com/api/common/v1"
+	"go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -220,7 +220,7 @@ var (
 )
 
 func request_SLAMService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client SLAMServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -253,7 +253,7 @@ func request_SLAMService_DoCommand_0(ctx context.Context, marshaler runtime.Mars
 }
 
 func local_request_SLAMService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server SLAMServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/service/vision/v1/vision.pb.gw.go b/service/vision/v1/vision.pb.gw.go
index ca0af0132..18ae0e3ec 100644
--- a/service/vision/v1/vision.pb.gw.go
+++ b/service/vision/v1/vision.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	"go.viam.com/api/common/v1"
+	v1_1 "go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -527,7 +527,7 @@ var (
 )
 
 func request_VisionService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client VisionServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -560,7 +560,7 @@ func request_VisionService_DoCommand_0(ctx context.Context, marshaler runtime.Ma
 }
 
 func local_request_VisionService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server VisionServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (