From ecf9773540ed84823bbf0a2d8545619fe7d71d29 Mon Sep 17 00:00:00 2001
From: Brent Johnson <brentj433@gmail.com>
Date: Wed, 13 Aug 2025 14:20:32 -0700
Subject: [PATCH 1/2] rename tick topic to TriggerManage

---
 .../trigger/v1/trigger_pb/trigger.j5s.pb.go   | 382 +++++++++---------
 .../v1/trigger_spb/trigger.p.j5s.pb.go        | 334 ++++++++-------
 .../v1/trigger_spb/trigger.p.j5s_j5.pb.go     |  49 ---
 gen/o5/trigger/v1/trigger_tpb/tick_j5.pb.go   |  10 -
 .../v1/trigger_tpb/trigger.p.j5s.pb.go        | 169 ++++----
 .../v1/trigger_tpb/trigger.p.j5s_grpc.pb.go   | 146 +++----
 .../v1/trigger_tpb/trigger.p.j5s_j5.pb.go     |  42 +-
 .../trigger.p.j5s_o5_messaging.pb.go          | 120 +++---
 integration/manage_trigger_test.go            | 318 +++++++++++++++
 integration/self_tick_test.go                 |   2 +-
 integration/trigger_test.go                   | 308 +-------------
 integration/universe.go                       |   8 +-
 proto/o5/trigger/v1/topic/trigger.p.j5s.proto |   6 +-
 proto/o5/trigger/v1/trigger.j5s               |   2 +-
 service/service.go                            |   4 +-
 service/trigger.go                            |   6 +-
 states/states.go                              |   4 +-
 17 files changed, 919 insertions(+), 991 deletions(-)
 create mode 100644 integration/manage_trigger_test.go

diff --git a/gen/o5/trigger/v1/trigger_pb/trigger.j5s.pb.go b/gen/o5/trigger/v1/trigger_pb/trigger.j5s.pb.go
index 4d7c9f8..06daed4 100644
--- a/gen/o5/trigger/v1/trigger_pb/trigger.j5s.pb.go
+++ b/gen/o5/trigger/v1/trigger_pb/trigger.j5s.pb.go
@@ -1141,214 +1141,212 @@ var file_o5_trigger_v1_trigger_j5s_proto_rawDesc = []byte{
 	0x73, 0x73, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x72, 0x65, 0x71, 0x72, 0x65,
 	0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x6a, 0x35, 0x2f, 0x73, 0x74, 0x61, 0x74,
 	0x65, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x22, 0x80, 0x01, 0x0a, 0x0b, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4b,
-	0x65, 0x79, 0x73, 0x12, 0x58, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x39, 0xba, 0x48, 0x15, 0x72, 0x13, 0x32, 0x11,
-	0x5e, 0x5b, 0x30, 0x2d, 0x39, 0x41, 0x2d, 0x5a, 0x61, 0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d,
-	0x24, 0xc2, 0xff, 0x8e, 0x02, 0x05, 0xb2, 0x02, 0x02, 0x08, 0x03, 0xea, 0x85, 0x8f, 0x02, 0x02,
-	0x08, 0x01, 0x8a, 0xf7, 0x98, 0xc6, 0x02, 0x0a, 0x72, 0x08, 0x1a, 0x06, 0x1a, 0x04, 0x52, 0x02,
-	0x08, 0x01, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x64, 0x3a, 0x17, 0xc2,
-	0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0xea, 0x85, 0x8f, 0x02, 0x0b, 0x0a, 0x07, 0x74, 0x72, 0x69,
-	0x67, 0x67, 0x65, 0x72, 0x10, 0x01, 0x22, 0xf8, 0x01, 0x0a, 0x0b, 0x54, 0x72, 0x69, 0x67, 0x67,
-	0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x31, 0x0a, 0x0c, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65,
+	0x6f, 0x74, 0x6f, 0x22, 0x70, 0x0a, 0x0b, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4b, 0x65,
+	0x79, 0x73, 0x12, 0x48, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x29, 0xba, 0x48, 0x15, 0x72, 0x13, 0x32, 0x11, 0x5e,
+	0x5b, 0x30, 0x2d, 0x39, 0x41, 0x2d, 0x5a, 0x61, 0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d, 0x24,
+	0xc2, 0xff, 0x8e, 0x02, 0x05, 0xb2, 0x02, 0x02, 0x08, 0x03, 0xea, 0x85, 0x8f, 0x02, 0x02, 0x08,
+	0x01, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x64, 0x3a, 0x17, 0xc2, 0xff,
+	0x8e, 0x02, 0x02, 0x52, 0x00, 0xea, 0x85, 0x8f, 0x02, 0x0b, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x67,
+	0x67, 0x65, 0x72, 0x10, 0x01, 0x22, 0xf8, 0x01, 0x0a, 0x0b, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65,
+	0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x31, 0x0a, 0x0c, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
+	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, 0xba, 0x48, 0x03,
+	0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x0b, 0x74, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x29, 0x0a, 0x08, 0x61, 0x70, 0x70, 0x5f,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8,
+	0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x07, 0x61, 0x70, 0x70, 0x4e,
+	0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x42, 0x08, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x04, 0x63, 0x72, 0x6f,
+	0x6e, 0x12, 0x54, 0x0a, 0x10, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x6d, 0x65, 0x74,
+	0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6a, 0x35,
+	0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x07, 0xc2,
+	0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x0f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d,
+	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x3a, 0x17, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00,
+	0xea, 0x85, 0x8f, 0x02, 0x0b, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x10, 0x04,
+	0x22, 0xc5, 0x02, 0x0a, 0x0c, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74,
+	0x65, 0x12, 0x45, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6a, 0x35, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x76,
+	0x31, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42,
+	0x0d, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x08,
+	0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x3f, 0x0a, 0x04, 0x6b, 0x65, 0x79, 0x73,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67,
+	0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4b, 0x65,
+	0x79, 0x73, 0x42, 0x0f, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x04, 0x52,
+	0x02, 0x08, 0x01, 0x52, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x12, 0x3d, 0x0a, 0x04, 0x64, 0x61, 0x74,
+	0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x44,
+	0x61, 0x74, 0x61, 0x42, 0x0d, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x02,
+	0x52, 0x00, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x55, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74,
+	0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1c, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72,
+	0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
+	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x1f, 0xba, 0x48, 0x08, 0xc8, 0x01, 0x01, 0x82, 0x01,
+	0x02, 0x10, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x5a, 0x00, 0x8a, 0xf7, 0x98, 0xc6, 0x02, 0x07,
+	0xa2, 0x01, 0x04, 0x52, 0x02, 0x08, 0x01, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x3a,
+	0x17, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0xea, 0x85, 0x8f, 0x02, 0x0b, 0x0a, 0x07, 0x74,
+	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x10, 0x02, 0x22, 0xe6, 0x0a, 0x0a, 0x10, 0x54, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x4c, 0x0a,
+	0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27,
+	0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54,
+	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x2e,
+	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00,
+	0x48, 0x00, 0x52, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x12, 0x4c, 0x0a, 0x07, 0x75,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6f,
+	0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x64, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x48, 0x00,
+	0x52, 0x07, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x12, 0x49, 0x0a, 0x06, 0x70, 0x61, 0x75,
+	0x73, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x6f, 0x35, 0x2e, 0x74,
+	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65,
+	0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x50, 0x61, 0x75, 0x73, 0x65,
+	0x64, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x48, 0x00, 0x52, 0x06, 0x70, 0x61,
+	0x75, 0x73, 0x65, 0x64, 0x12, 0x52, 0x0a, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65,
+	0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45,
+	0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74,
+	0x65, 0x64, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x48, 0x00, 0x52, 0x09, 0x61,
+	0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x64, 0x12, 0x6b, 0x0a, 0x12, 0x6d, 0x61, 0x6e, 0x75,
+	0x61, 0x6c, 0x6c, 0x79, 0x5f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x65, 0x64, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65,
+	0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e,
+	0x74, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x6c, 0x79, 0x54, 0x72,
+	0x69, 0x67, 0x67, 0x65, 0x72, 0x65, 0x64, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00,
+	0x48, 0x00, 0x52, 0x11, 0x6d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x6c, 0x79, 0x54, 0x72, 0x69, 0x67,
+	0x67, 0x65, 0x72, 0x65, 0x64, 0x12, 0x52, 0x0a, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
+	0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72,
+	0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
+	0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65,
+	0x72, 0x65, 0x64, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x48, 0x00, 0x52, 0x09,
+	0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x65, 0x64, 0x12, 0x4f, 0x0a, 0x08, 0x61, 0x72, 0x63,
+	0x68, 0x69, 0x76, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x6f, 0x35,
+	0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67,
+	0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x41, 0x72, 0x63,
+	0x68, 0x69, 0x76, 0x65, 0x64, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x48, 0x00,
+	0x52, 0x08, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x64, 0x1a, 0xf0, 0x01, 0x0a, 0x07, 0x43,
+	0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x12, 0x31, 0x0a, 0x0c, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65,
 	0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, 0xba, 0x48,
 	0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x0b, 0x74, 0x72,
 	0x69, 0x67, 0x67, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x29, 0x0a, 0x08, 0x61, 0x70, 0x70,
 	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, 0xba, 0x48, 0x03,
 	0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x07, 0x61, 0x70, 0x70,
-	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x42, 0x08, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x04, 0x63, 0x72,
-	0x6f, 0x6e, 0x12, 0x54, 0x0a, 0x10, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x6d, 0x65,
-	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6a,
-	0x35, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x07,
-	0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x0f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x3a, 0x17, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52,
-	0x00, 0xea, 0x85, 0x8f, 0x02, 0x0b, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x10,
-	0x04, 0x22, 0xc5, 0x02, 0x0a, 0x0c, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x53, 0x74, 0x61,
-	0x74, 0x65, 0x12, 0x45, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01,
+	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x09, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2,
+	0x01, 0x00, 0x52, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x12, 0x5a, 0x0a, 0x10, 0x72, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6a, 0x35, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x69, 0x6e,
+	0x67, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x74, 0x61,
+	0x64, 0x61, 0x74, 0x61, 0x42, 0x0d, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02,
+	0x02, 0x52, 0x00, 0x52, 0x0f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x74, 0x61,
+	0x64, 0x61, 0x74, 0x61, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x1a, 0xf0, 0x01,
+	0x0a, 0x07, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x12, 0x31, 0x0a, 0x0c, 0x74, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42,
+	0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52,
+	0x0b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x29, 0x0a, 0x08,
+	0x61, 0x70, 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e,
+	0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x07,
+	0x61, 0x70, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e,
+	0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x12, 0x5a, 0x0a, 0x10, 0x72,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6a, 0x35, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d,
+	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x0d, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2,
+	0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x0f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d,
+	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00,
+	0x1a, 0x11, 0x0a, 0x06, 0x50, 0x61, 0x75, 0x73, 0x65, 0x64, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02,
+	0x02, 0x52, 0x00, 0x1a, 0x14, 0x0a, 0x09, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x64,
+	0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x1a, 0x6b, 0x0a, 0x11, 0x4d, 0x61, 0x6e,
+	0x75, 0x61, 0x6c, 0x6c, 0x79, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x65, 0x64, 0x12, 0x4d,
+	0x0a, 0x0c, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x74, 0x69, 0x6d, 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,
+	0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xaa, 0x02, 0x00,
+	0x52, 0x0b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x3a, 0x07, 0xc2,
+	0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x1a, 0x63, 0x0a, 0x09, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65,
+	0x72, 0x65, 0x64, 0x12, 0x4d, 0x0a, 0x0c, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x74,
+	0x69, 0x6d, 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, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e,
+	0x02, 0x03, 0xaa, 0x02, 0x00, 0x52, 0x0b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x54, 0x69,
+	0x6d, 0x65, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x1a, 0x13, 0x0a, 0x08, 0x41,
+	0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x64, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00,
+	0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x5a, 0x00, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70,
+	0x65, 0x22, 0x82, 0x02, 0x0a, 0x0c, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65,
+	0x6e, 0x74, 0x12, 0x45, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6a, 0x35, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e,
-	0x76, 0x31, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
+	0x76, 0x31, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
 	0x42, 0x0d, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52,
 	0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x3f, 0x0a, 0x04, 0x6b, 0x65, 0x79,
 	0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69,
 	0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4b,
 	0x65, 0x79, 0x73, 0x42, 0x0f, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x04,
-	0x52, 0x02, 0x08, 0x01, 0x52, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x12, 0x3d, 0x0a, 0x04, 0x64, 0x61,
-	0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72,
-	0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-	0x44, 0x61, 0x74, 0x61, 0x42, 0x0d, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02,
-	0x02, 0x52, 0x00, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x55, 0x0a, 0x06, 0x73, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1c, 0x2e, 0x6f, 0x35, 0x2e, 0x74,
+	0x52, 0x02, 0x08, 0x01, 0x52, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x12, 0x51, 0x0a, 0x05, 0x65, 0x76,
+	0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6f, 0x35, 0x2e, 0x74,
 	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65,
-	0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x1f, 0xba, 0x48, 0x08, 0xc8, 0x01, 0x01, 0x82,
-	0x01, 0x02, 0x10, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x5a, 0x00, 0x8a, 0xf7, 0x98, 0xc6, 0x02,
-	0x07, 0xa2, 0x01, 0x04, 0x52, 0x02, 0x08, 0x01, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x3a, 0x17, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0xea, 0x85, 0x8f, 0x02, 0x0b, 0x0a, 0x07,
-	0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x10, 0x02, 0x22, 0xe6, 0x0a, 0x0a, 0x10, 0x54, 0x72,
-	0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x4c,
-	0x0a, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x27, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e,
-	0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65,
-	0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52,
-	0x00, 0x48, 0x00, 0x52, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x12, 0x4c, 0x0a, 0x07,
-	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e,
-	0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72,
-	0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x48,
-	0x00, 0x52, 0x07, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x12, 0x49, 0x0a, 0x06, 0x70, 0x61,
-	0x75, 0x73, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x6f, 0x35, 0x2e,
-	0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67,
-	0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x50, 0x61, 0x75, 0x73,
-	0x65, 0x64, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x48, 0x00, 0x52, 0x06, 0x70,
-	0x61, 0x75, 0x73, 0x65, 0x64, 0x12, 0x52, 0x0a, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74,
-	0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72,
-	0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-	0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61,
-	0x74, 0x65, 0x64, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x48, 0x00, 0x52, 0x09,
-	0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x64, 0x12, 0x6b, 0x0a, 0x12, 0x6d, 0x61, 0x6e,
-	0x75, 0x61, 0x6c, 0x6c, 0x79, 0x5f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x65, 0x64, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67,
-	0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65,
-	0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x6c, 0x79, 0x54,
-	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x65, 0x64, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52,
-	0x00, 0x48, 0x00, 0x52, 0x11, 0x6d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x6c, 0x79, 0x54, 0x72, 0x69,
-	0x67, 0x67, 0x65, 0x72, 0x65, 0x64, 0x12, 0x52, 0x0a, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65,
-	0x72, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x6f, 0x35, 0x2e, 0x74,
-	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65,
-	0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67,
-	0x65, 0x72, 0x65, 0x64, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x48, 0x00, 0x52,
-	0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x65, 0x64, 0x12, 0x4f, 0x0a, 0x08, 0x61, 0x72,
-	0x63, 0x68, 0x69, 0x76, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x6f,
-	0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69,
-	0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x41, 0x72,
-	0x63, 0x68, 0x69, 0x76, 0x65, 0x64, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x48,
-	0x00, 0x52, 0x08, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x64, 0x1a, 0xf0, 0x01, 0x0a, 0x07,
-	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x12, 0x31, 0x0a, 0x0c, 0x74, 0x72, 0x69, 0x67, 0x67,
-	0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, 0xba,
-	0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x0b, 0x74,
-	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x29, 0x0a, 0x08, 0x61, 0x70,
-	0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, 0xba, 0x48,
-	0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x07, 0x61, 0x70,
-	0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03,
-	0xf2, 0x01, 0x00, 0x52, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x12, 0x5a, 0x0a, 0x10, 0x72, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6a, 0x35, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x69,
-	0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x74,
-	0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x0d, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e,
-	0x02, 0x02, 0x52, 0x00, 0x52, 0x0f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x74,
-	0x61, 0x64, 0x61, 0x74, 0x61, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x1a, 0xf0,
-	0x01, 0x0a, 0x07, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x12, 0x31, 0x0a, 0x0c, 0x74, 0x72,
-	0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x42, 0x1a, 0xba, 0x48, 0x03, 0xc8,
+	0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x62, 0x00, 0x8a, 0xf7, 0x98, 0xc6, 0x02, 0x07, 0xaa,
+	0x01, 0x04, 0x52, 0x02, 0x08, 0x01, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x3a, 0x17, 0xc2,
+	0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0xea, 0x85, 0x8f, 0x02, 0x0b, 0x0a, 0x07, 0x74, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x10, 0x03, 0x22, 0xef, 0x05, 0x0a, 0x0a, 0x41, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x43, 0x0a, 0x06, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67,
+	0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65,
+	0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00,
+	0x48, 0x00, 0x52, 0x06, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x43, 0x0a, 0x06, 0x75, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6f, 0x35, 0x2e,
+	0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x07, 0xc2, 0xff,
+	0x8e, 0x02, 0x02, 0x52, 0x00, 0x48, 0x00, 0x52, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12,
+	0x46, 0x0a, 0x07, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x21, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31,
+	0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x41, 0x72, 0x63, 0x68,
+	0x69, 0x76, 0x65, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x48, 0x00, 0x52, 0x07,
+	0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x1a, 0xe4, 0x01, 0x0a, 0x06, 0x43, 0x72, 0x65, 0x61,
+	0x74, 0x65, 0x12, 0x46, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x22, 0xba, 0x48, 0x15, 0x72, 0x13, 0x32, 0x11, 0x5e,
+	0x5b, 0x30, 0x2d, 0x39, 0x41, 0x2d, 0x5a, 0x61, 0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d, 0x24,
+	0xc2, 0xff, 0x8e, 0x02, 0x05, 0xb2, 0x02, 0x02, 0x08, 0x03, 0x48, 0x00, 0x52, 0x09, 0x74, 0x72,
+	0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, 0x0c, 0x74, 0x72,
+	0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
 	0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00,
 	0x52, 0x0b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x29, 0x0a,
-	0x08, 0x61, 0x70, 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42,
+	0x08, 0x61, 0x70, 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42,
 	0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52,
-	0x07, 0x61, 0x70, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x04, 0x63, 0x72, 0x6f, 0x6e,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff,
-	0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x12, 0x5a, 0x0a, 0x10,
-	0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6a, 0x35, 0x2e, 0x6d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x0d, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01,
-	0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x0f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52,
-	0x00, 0x1a, 0x11, 0x0a, 0x06, 0x50, 0x61, 0x75, 0x73, 0x65, 0x64, 0x3a, 0x07, 0xc2, 0xff, 0x8e,
-	0x02, 0x02, 0x52, 0x00, 0x1a, 0x14, 0x0a, 0x09, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65,
-	0x64, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x1a, 0x6b, 0x0a, 0x11, 0x4d, 0x61,
-	0x6e, 0x75, 0x61, 0x6c, 0x6c, 0x79, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x65, 0x64, 0x12,
-	0x4d, 0x0a, 0x0c, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x74, 0x69, 0x6d, 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, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xaa, 0x02,
-	0x00, 0x52, 0x0b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x3a, 0x07,
-	0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x1a, 0x63, 0x0a, 0x09, 0x54, 0x72, 0x69, 0x67, 0x67,
-	0x65, 0x72, 0x65, 0x64, 0x12, 0x4d, 0x0a, 0x0c, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f,
-	0x74, 0x69, 0x6d, 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, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff,
-	0x8e, 0x02, 0x03, 0xaa, 0x02, 0x00, 0x52, 0x0b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x54,
-	0x69, 0x6d, 0x65, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x1a, 0x13, 0x0a, 0x08,
-	0x41, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x64, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52,
-	0x00, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x5a, 0x00, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79,
-	0x70, 0x65, 0x22, 0x82, 0x02, 0x0a, 0x0c, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76,
-	0x65, 0x6e, 0x74, 0x12, 0x45, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6a, 0x35, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
-	0x61, 0x42, 0x0d, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00,
-	0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x3f, 0x0a, 0x04, 0x6b, 0x65,
-	0x79, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72,
-	0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-	0x4b, 0x65, 0x79, 0x73, 0x42, 0x0f, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02,
-	0x04, 0x52, 0x02, 0x08, 0x01, 0x52, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x12, 0x51, 0x0a, 0x05, 0x65,
-	0x76, 0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6f, 0x35, 0x2e,
-	0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67,
-	0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x42, 0x1a, 0xba, 0x48, 0x03,
-	0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x62, 0x00, 0x8a, 0xf7, 0x98, 0xc6, 0x02, 0x07,
-	0xaa, 0x01, 0x04, 0x52, 0x02, 0x08, 0x01, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x3a, 0x17,
-	0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0xea, 0x85, 0x8f, 0x02, 0x0b, 0x0a, 0x07, 0x74, 0x72,
-	0x69, 0x67, 0x67, 0x65, 0x72, 0x10, 0x03, 0x22, 0xef, 0x05, 0x0a, 0x0a, 0x41, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x43, 0x0a, 0x06, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67,
-	0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70,
-	0x65, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52,
-	0x00, 0x48, 0x00, 0x52, 0x06, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x43, 0x0a, 0x06, 0x75,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6f, 0x35,
-	0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x07, 0xc2,
-	0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x48, 0x00, 0x52, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x12, 0x46, 0x0a, 0x07, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x21, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76,
-	0x31, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x41, 0x72, 0x63,
-	0x68, 0x69, 0x76, 0x65, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x48, 0x00, 0x52,
-	0x07, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x1a, 0xe4, 0x01, 0x0a, 0x06, 0x43, 0x72, 0x65,
-	0x61, 0x74, 0x65, 0x12, 0x46, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x22, 0xba, 0x48, 0x15, 0x72, 0x13, 0x32, 0x11,
-	0x5e, 0x5b, 0x30, 0x2d, 0x39, 0x41, 0x2d, 0x5a, 0x61, 0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d,
-	0x24, 0xc2, 0xff, 0x8e, 0x02, 0x05, 0xb2, 0x02, 0x02, 0x08, 0x03, 0x48, 0x00, 0x52, 0x09, 0x74,
-	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, 0x0c, 0x74,
-	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01,
-	0x00, 0x52, 0x0b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x29,
-	0x0a, 0x08, 0x61, 0x70, 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00,
-	0x52, 0x07, 0x61, 0x70, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x04, 0x63, 0x72, 0x6f,
-	0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01,
-	0x00, 0x52, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00,
-	0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x1a,
-	0xd3, 0x01, 0x0a, 0x06, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x44, 0x0a, 0x0a, 0x74, 0x72,
-	0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x25,
-	0xba, 0x48, 0x18, 0xc8, 0x01, 0x01, 0x72, 0x13, 0x32, 0x11, 0x5e, 0x5b, 0x30, 0x2d, 0x39, 0x41,
-	0x2d, 0x5a, 0x61, 0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d, 0x24, 0xc2, 0xff, 0x8e, 0x02, 0x05,
-	0xb2, 0x02, 0x02, 0x08, 0x03, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x64,
-	0x12, 0x31, 0x0a, 0x0c, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff,
-	0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x0b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4e,
-	0x61, 0x6d, 0x65, 0x12, 0x29, 0x0a, 0x08, 0x61, 0x70, 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e,
-	0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x07, 0x61, 0x70, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c,
-	0x0a, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xc2, 0xff,
-	0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x3a, 0x07, 0xc2, 0xff,
-	0x8e, 0x02, 0x02, 0x52, 0x00, 0x1a, 0x41, 0x0a, 0x07, 0x41, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65,
-	0x12, 0x2d, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01,
+	0x07, 0x61, 0x70, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x04, 0x63, 0x72, 0x6f, 0x6e,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00,
+	0x52, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x42,
+	0x0d, 0x0a, 0x0b, 0x5f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x1a, 0xd3,
+	0x01, 0x0a, 0x06, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x44, 0x0a, 0x0a, 0x74, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x25, 0xba,
+	0x48, 0x18, 0xc8, 0x01, 0x01, 0x72, 0x13, 0x32, 0x11, 0x5e, 0x5b, 0x30, 0x2d, 0x39, 0x41, 0x2d,
+	0x5a, 0x61, 0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d, 0x24, 0xc2, 0xff, 0x8e, 0x02, 0x05, 0xb2,
+	0x02, 0x02, 0x08, 0x03, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x64, 0x12,
+	0x31, 0x0a, 0x0c, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e,
+	0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x0b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4e, 0x61,
+	0x6d, 0x65, 0x12, 0x29, 0x0a, 0x08, 0x61, 0x70, 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03,
 	0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02,
-	0x03, 0xf2, 0x01, 0x00, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x64, 0x3a,
-	0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x5a,
-	0x00, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x2a, 0x82, 0x01, 0x0a, 0x0d, 0x54, 0x72,
-	0x69, 0x67, 0x67, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1e, 0x0a, 0x1a, 0x54,
-	0x52, 0x49, 0x47, 0x47, 0x45, 0x52, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x55, 0x4e,
-	0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x54,
-	0x52, 0x49, 0x47, 0x47, 0x45, 0x52, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x41, 0x43,
-	0x54, 0x49, 0x56, 0x45, 0x10, 0x01, 0x12, 0x19, 0x0a, 0x15, 0x54, 0x52, 0x49, 0x47, 0x47, 0x45,
-	0x52, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x50, 0x41, 0x55, 0x53, 0x45, 0x44, 0x10,
-	0x02, 0x12, 0x1b, 0x0a, 0x17, 0x54, 0x52, 0x49, 0x47, 0x47, 0x45, 0x52, 0x5f, 0x53, 0x54, 0x41,
-	0x54, 0x55, 0x53, 0x5f, 0x41, 0x52, 0x43, 0x48, 0x49, 0x56, 0x45, 0x44, 0x10, 0x03, 0x42, 0x39,
-	0x5a, 0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x65, 0x6e,
-	0x74, 0x6f, 0x70, 0x73, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x67, 0x65, 0x6e,
-	0x2f, 0x6f, 0x35, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74,
-	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x03, 0xf2, 0x01, 0x00, 0x52, 0x07, 0x61, 0x70, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a,
+	0x04, 0x63, 0x72, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xc2, 0xff, 0x8e,
+	0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x3a, 0x07, 0xc2, 0xff, 0x8e,
+	0x02, 0x02, 0x52, 0x00, 0x1a, 0x41, 0x0a, 0x07, 0x41, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x12,
+	0x2d, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03,
+	0xf2, 0x01, 0x00, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x64, 0x3a, 0x07,
+	0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x5a, 0x00,
+	0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x2a, 0x82, 0x01, 0x0a, 0x0d, 0x54, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1e, 0x0a, 0x1a, 0x54, 0x52,
+	0x49, 0x47, 0x47, 0x45, 0x52, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x55, 0x4e, 0x53,
+	0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x54, 0x52,
+	0x49, 0x47, 0x47, 0x45, 0x52, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x41, 0x43, 0x54,
+	0x49, 0x56, 0x45, 0x10, 0x01, 0x12, 0x19, 0x0a, 0x15, 0x54, 0x52, 0x49, 0x47, 0x47, 0x45, 0x52,
+	0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x50, 0x41, 0x55, 0x53, 0x45, 0x44, 0x10, 0x02,
+	0x12, 0x1b, 0x0a, 0x17, 0x54, 0x52, 0x49, 0x47, 0x47, 0x45, 0x52, 0x5f, 0x53, 0x54, 0x41, 0x54,
+	0x55, 0x53, 0x5f, 0x41, 0x52, 0x43, 0x48, 0x49, 0x56, 0x45, 0x44, 0x10, 0x03, 0x42, 0x39, 0x5a,
+	0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x65, 0x6e, 0x74,
+	0x6f, 0x70, 0x73, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x67, 0x65, 0x6e, 0x2f,
+	0x6f, 0x35, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72,
+	0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/gen/o5/trigger/v1/trigger_spb/trigger.p.j5s.pb.go b/gen/o5/trigger/v1/trigger_spb/trigger.p.j5s.pb.go
index 745ff9f..3acea1e 100644
--- a/gen/o5/trigger/v1/trigger_spb/trigger.p.j5s.pb.go
+++ b/gen/o5/trigger/v1/trigger_spb/trigger.p.j5s.pb.go
@@ -653,184 +653,180 @@ var file_o5_trigger_v1_service_trigger_p_j5s_proto_rawDesc = []byte{
 	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74,
 	0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b,
 	0x6a, 0x35, 0x2f, 0x65, 0x78, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x6a, 0x35, 0x2f,
-	0x6c, 0x69, 0x73, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x15, 0x6a, 0x35, 0x2f, 0x6c, 0x69,
-	0x73, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, 0x67, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x16, 0x6a, 0x35, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x71, 0x75, 0x65,
-	0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x6f, 0x35, 0x2f, 0x74, 0x72, 0x69,
-	0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e,
-	0x6a, 0x35, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x76, 0x0a, 0x11, 0x54, 0x72, 0x69,
-	0x67, 0x67, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x58,
-	0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x42, 0x39, 0xba, 0x48, 0x15, 0x72, 0x13, 0x32, 0x11, 0x5e, 0x5b, 0x30, 0x2d, 0x39,
-	0x41, 0x2d, 0x5a, 0x61, 0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d, 0x24, 0xc2, 0xff, 0x8e, 0x02,
-	0x05, 0xb2, 0x02, 0x02, 0x08, 0x03, 0xea, 0x85, 0x8f, 0x02, 0x02, 0x08, 0x01, 0x8a, 0xf7, 0x98,
-	0xc6, 0x02, 0x0a, 0x72, 0x08, 0x1a, 0x06, 0x1a, 0x04, 0x52, 0x02, 0x08, 0x01, 0x52, 0x09, 0x74,
-	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x64, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52,
-	0x00, 0x22, 0x63, 0x0a, 0x12, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x44, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67,
-	0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72,
-	0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-	0x53, 0x74, 0x61, 0x74, 0x65, 0x42, 0x0d, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e,
-	0x02, 0x02, 0x52, 0x00, 0x52, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x3a, 0x07, 0xc2,
-	0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22, 0x8c, 0x01, 0x0a, 0x12, 0x54, 0x72, 0x69, 0x67, 0x67,
-	0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x34, 0x0a,
-	0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6a, 0x35,
-	0x2e, 0x6c, 0x69, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x04, 0x70,
-	0x61, 0x67, 0x65, 0x12, 0x37, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6a, 0x35, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e,
-	0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x07, 0xc2, 0xff,
-	0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x3a, 0x07, 0xc2, 0xff,
-	0x8e, 0x02, 0x02, 0x52, 0x00, 0x22, 0x96, 0x01, 0x0a, 0x13, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65,
-	0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a,
-	0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b,
-	0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54,
-	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x42, 0x08, 0xc2, 0xff, 0x8e,
-	0x02, 0x03, 0xaa, 0x01, 0x00, 0x52, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x12, 0x35,
-	0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6a,
-	0x35, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52,
-	0x04, 0x70, 0x61, 0x67, 0x65, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22, 0xe8,
-	0x01, 0x0a, 0x14, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x58, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67,
-	0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x39, 0xba, 0x48, 0x15,
-	0x72, 0x13, 0x32, 0x11, 0x5e, 0x5b, 0x30, 0x2d, 0x39, 0x41, 0x2d, 0x5a, 0x61, 0x2d, 0x7a, 0x5d,
-	0x7b, 0x32, 0x32, 0x7d, 0x24, 0xc2, 0xff, 0x8e, 0x02, 0x05, 0xb2, 0x02, 0x02, 0x08, 0x03, 0xea,
-	0x85, 0x8f, 0x02, 0x02, 0x08, 0x01, 0x8a, 0xf7, 0x98, 0xc6, 0x02, 0x0a, 0x72, 0x08, 0x1a, 0x06,
-	0x1a, 0x04, 0x52, 0x02, 0x08, 0x01, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49,
-	0x64, 0x12, 0x34, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x17, 0x2e, 0x6a, 0x35, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x67,
-	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52,
-	0x00, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12, 0x37, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6a, 0x35, 0x2e, 0x6c, 0x69, 0x73, 0x74,
-	0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79,
-	0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22, 0x96, 0x01, 0x0a, 0x15, 0x54, 0x72,
-	0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x3d, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-	0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74,
-	0x42, 0x08, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xaa, 0x01, 0x00, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e,
-	0x74, 0x73, 0x12, 0x35, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x18, 0x2e, 0x6a, 0x35, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61,
-	0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02,
-	0x02, 0x52, 0x00, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02,
-	0x52, 0x00, 0x22, 0x64, 0x0a, 0x13, 0x50, 0x61, 0x75, 0x73, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67,
-	0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x44, 0x0a, 0x0a, 0x74, 0x72, 0x69,
-	0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x25, 0xba,
-	0x48, 0x18, 0xc8, 0x01, 0x01, 0x72, 0x13, 0x32, 0x11, 0x5e, 0x5b, 0x30, 0x2d, 0x39, 0x41, 0x2d,
-	0x5a, 0x61, 0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d, 0x24, 0xc2, 0xff, 0x8e, 0x02, 0x05, 0xb2,
-	0x02, 0x02, 0x08, 0x03, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x64, 0x3a,
-	0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22, 0x65, 0x0a, 0x14, 0x50, 0x61, 0x75, 0x73,
-	0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x44, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1b, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76,
-	0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x42, 0x0d,
-	0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x07, 0x74,
-	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22,
-	0x65, 0x0a, 0x14, 0x52, 0x65, 0x73, 0x75, 0x6d, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x44, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67,
-	0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x25, 0xba, 0x48, 0x18,
-	0xc8, 0x01, 0x01, 0x72, 0x13, 0x32, 0x11, 0x5e, 0x5b, 0x30, 0x2d, 0x39, 0x41, 0x2d, 0x5a, 0x61,
-	0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d, 0x24, 0xc2, 0xff, 0x8e, 0x02, 0x05, 0xb2, 0x02, 0x02,
-	0x08, 0x03, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x64, 0x3a, 0x07, 0xc2,
-	0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22, 0x66, 0x0a, 0x15, 0x52, 0x65, 0x73, 0x75, 0x6d, 0x65,
-	0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x44, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x15, 0x6a, 0x35, 0x2f,
+	0x6c, 0x69, 0x73, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, 0x67, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x1a, 0x16, 0x6a, 0x35, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x71,
+	0x75, 0x65, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x6f, 0x35, 0x2f, 0x74,
+	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65,
+	0x72, 0x2e, 0x6a, 0x35, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x66, 0x0a, 0x11, 0x54,
+	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x48, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x42, 0x29, 0xba, 0x48, 0x15, 0x72, 0x13, 0x32, 0x11, 0x5e, 0x5b, 0x30,
+	0x2d, 0x39, 0x41, 0x2d, 0x5a, 0x61, 0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d, 0x24, 0xc2, 0xff,
+	0x8e, 0x02, 0x05, 0xb2, 0x02, 0x02, 0x08, 0x03, 0xea, 0x85, 0x8f, 0x02, 0x02, 0x08, 0x01, 0x52,
+	0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x64, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02,
+	0x02, 0x52, 0x00, 0x22, 0x63, 0x0a, 0x12, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x47, 0x65,
+	0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x44, 0x0a, 0x07, 0x74, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6f, 0x35, 0x2e,
+	0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67,
+	0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x42, 0x0d, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2,
+	0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x3a,
+	0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22, 0x8c, 0x01, 0x0a, 0x12, 0x54, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x34, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e,
+	0x6a, 0x35, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52,
+	0x04, 0x70, 0x61, 0x67, 0x65, 0x12, 0x37, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6a, 0x35, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x2e, 0x76,
+	0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x07,
+	0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x3a, 0x07,
+	0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22, 0x96, 0x01, 0x0a, 0x13, 0x54, 0x72, 0x69, 0x67,
+	0x67, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x3f, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
 	0x32, 0x1b, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31,
-	0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x42, 0x0d, 0xba,
-	0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x07, 0x74, 0x72,
-	0x69, 0x67, 0x67, 0x65, 0x72, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22, 0xb6,
-	0x01, 0x0a, 0x16, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x6c, 0x79, 0x54, 0x72, 0x69, 0x67, 0x67,
-	0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x44, 0x0a, 0x0a, 0x74, 0x72, 0x69,
-	0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x25, 0xba,
-	0x48, 0x18, 0xc8, 0x01, 0x01, 0x72, 0x13, 0x32, 0x11, 0x5e, 0x5b, 0x30, 0x2d, 0x39, 0x41, 0x2d,
-	0x5a, 0x61, 0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d, 0x24, 0xc2, 0xff, 0x8e, 0x02, 0x05, 0xb2,
-	0x02, 0x02, 0x08, 0x03, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x64, 0x12,
-	0x4d, 0x0a, 0x0c, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x74, 0x69, 0x6d, 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, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xaa, 0x02,
-	0x00, 0x52, 0x0b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x3a, 0x07,
-	0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22, 0x68, 0x0a, 0x17, 0x4d, 0x61, 0x6e, 0x75, 0x61,
-	0x6c, 0x6c, 0x79, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x42, 0x08, 0xc2,
+	0xff, 0x8e, 0x02, 0x03, 0xaa, 0x01, 0x00, 0x52, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
+	0x12, 0x35, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18,
+	0x2e, 0x6a, 0x35, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x65,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52,
+	0x00, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00,
+	0x22, 0xd8, 0x01, 0x0a, 0x14, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e,
+	0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x48, 0x0a, 0x0a, 0x74, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x29, 0xba,
+	0x48, 0x15, 0x72, 0x13, 0x32, 0x11, 0x5e, 0x5b, 0x30, 0x2d, 0x39, 0x41, 0x2d, 0x5a, 0x61, 0x2d,
+	0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d, 0x24, 0xc2, 0xff, 0x8e, 0x02, 0x05, 0xb2, 0x02, 0x02, 0x08,
+	0x03, 0xea, 0x85, 0x8f, 0x02, 0x02, 0x08, 0x01, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65,
+	0x72, 0x49, 0x64, 0x12, 0x34, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x17, 0x2e, 0x6a, 0x35, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x50,
+	0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02,
+	0x02, 0x52, 0x00, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12, 0x37, 0x0a, 0x05, 0x71, 0x75, 0x65,
+	0x72, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6a, 0x35, 0x2e, 0x6c, 0x69,
+	0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x05, 0x71, 0x75, 0x65,
+	0x72, 0x79, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22, 0x96, 0x01, 0x0a, 0x15,
+	0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3d, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67,
+	0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65,
+	0x6e, 0x74, 0x42, 0x08, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xaa, 0x01, 0x00, 0x52, 0x06, 0x65, 0x76,
+	0x65, 0x6e, 0x74, 0x73, 0x12, 0x35, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6a, 0x35, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e,
+	0x50, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x07, 0xc2, 0xff,
+	0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x3a, 0x07, 0xc2, 0xff, 0x8e,
+	0x02, 0x02, 0x52, 0x00, 0x22, 0x64, 0x0a, 0x13, 0x50, 0x61, 0x75, 0x73, 0x65, 0x54, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x44, 0x0a, 0x0a, 0x74,
+	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42,
+	0x25, 0xba, 0x48, 0x18, 0xc8, 0x01, 0x01, 0x72, 0x13, 0x32, 0x11, 0x5e, 0x5b, 0x30, 0x2d, 0x39,
+	0x41, 0x2d, 0x5a, 0x61, 0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d, 0x24, 0xc2, 0xff, 0x8e, 0x02,
+	0x05, 0xb2, 0x02, 0x02, 0x08, 0x03, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49,
+	0x64, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22, 0x65, 0x0a, 0x14, 0x50, 0x61,
+	0x75, 0x73, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
 	0x73, 0x65, 0x12, 0x44, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
 	0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65,
 	0x42, 0x0d, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52,
 	0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52,
-	0x00, 0x32, 0xf8, 0x03, 0x0a, 0x13, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x51, 0x75, 0x65,
-	0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x96, 0x01, 0x0a, 0x0a, 0x54, 0x72,
-	0x69, 0x67, 0x67, 0x65, 0x72, 0x47, 0x65, 0x74, 0x12, 0x28, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72,
-	0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x29, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e,
-	0x76, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67,
-	0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x33, 0xc2,
-	0xff, 0x8e, 0x02, 0x04, 0x52, 0x02, 0x08, 0x01, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x12, 0x22,
-	0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x69, 0x67,
-	0x67, 0x65, 0x72, 0x2f, 0x71, 0x2f, 0x7b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69,
-	0x64, 0x7d, 0x12, 0x8c, 0x01, 0x0a, 0x0b, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4c, 0x69,
-	0x73, 0x74, 0x12, 0x29, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e,
+	0x00, 0x22, 0x65, 0x0a, 0x14, 0x52, 0x65, 0x73, 0x75, 0x6d, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67,
+	0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x44, 0x0a, 0x0a, 0x74, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x25, 0xba,
+	0x48, 0x18, 0xc8, 0x01, 0x01, 0x72, 0x13, 0x32, 0x11, 0x5e, 0x5b, 0x30, 0x2d, 0x39, 0x41, 0x2d,
+	0x5a, 0x61, 0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d, 0x24, 0xc2, 0xff, 0x8e, 0x02, 0x05, 0xb2,
+	0x02, 0x02, 0x08, 0x03, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x64, 0x3a,
+	0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22, 0x66, 0x0a, 0x15, 0x52, 0x65, 0x73, 0x75,
+	0x6d, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x44, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e,
+	0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x42,
+	0x0d, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x07,
+	0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00,
+	0x22, 0xb6, 0x01, 0x0a, 0x16, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x6c, 0x79, 0x54, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x44, 0x0a, 0x0a, 0x74,
+	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42,
+	0x25, 0xba, 0x48, 0x18, 0xc8, 0x01, 0x01, 0x72, 0x13, 0x32, 0x11, 0x5e, 0x5b, 0x30, 0x2d, 0x39,
+	0x41, 0x2d, 0x5a, 0x61, 0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d, 0x24, 0xc2, 0xff, 0x8e, 0x02,
+	0x05, 0xb2, 0x02, 0x02, 0x08, 0x03, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49,
+	0x64, 0x12, 0x4d, 0x0a, 0x0c, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x74, 0x69, 0x6d,
+	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, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03,
+	0xaa, 0x02, 0x00, 0x52, 0x0b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65,
+	0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22, 0x68, 0x0a, 0x17, 0x4d, 0x61, 0x6e,
+	0x75, 0x61, 0x6c, 0x6c, 0x79, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x44, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67,
+	0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x53, 0x74, 0x61,
+	0x74, 0x65, 0x42, 0x0d, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52,
+	0x00, 0x52, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02,
+	0x02, 0x52, 0x00, 0x32, 0xf8, 0x03, 0x0a, 0x13, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x51,
+	0x75, 0x65, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x96, 0x01, 0x0a, 0x0a,
+	0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x47, 0x65, 0x74, 0x12, 0x28, 0x2e, 0x6f, 0x35, 0x2e,
+	0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65,
+	0x72, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x54, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x33, 0xc2, 0xff, 0x8e, 0x02, 0x04, 0x52, 0x02, 0x08, 0x01, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24,
+	0x12, 0x22, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72,
+	0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x71, 0x2f, 0x7b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
+	0x5f, 0x69, 0x64, 0x7d, 0x12, 0x8c, 0x01, 0x0a, 0x0b, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
+	0x4c, 0x69, 0x73, 0x74, 0x12, 0x29, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65,
+	0x72, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x54, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x2a, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e,
+	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4c,
+	0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0xc2, 0xff, 0x8e,
+	0x02, 0x04, 0x52, 0x02, 0x10, 0x01, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x17, 0x12, 0x15, 0x2f, 0x74,
+	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65,
+	0x72, 0x2f, 0x71, 0x12, 0xa6, 0x01, 0x0a, 0x0d, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45,
+	0x76, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x2b, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67,
+	0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x54, 0x72,
+	0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e,
 	0x76, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67,
-	0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e,
-	0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4c, 0x69, 0x73,
-	0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0xc2, 0xff, 0x8e, 0x02, 0x04,
-	0x52, 0x02, 0x10, 0x01, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x17, 0x12, 0x15, 0x2f, 0x74, 0x72, 0x69,
-	0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f,
-	0x71, 0x12, 0xa6, 0x01, 0x0a, 0x0d, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65,
-	0x6e, 0x74, 0x73, 0x12, 0x2b, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-	0x2e, 0x76, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x54, 0x72, 0x69, 0x67,
-	0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x2c, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31,
-	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-	0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x3a,
-	0xc2, 0xff, 0x8e, 0x02, 0x04, 0x52, 0x02, 0x18, 0x01, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2b, 0x12,
-	0x29, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x69,
-	0x67, 0x67, 0x65, 0x72, 0x2f, 0x71, 0x2f, 0x7b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f,
-	0x69, 0x64, 0x7d, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x1a, 0x10, 0xea, 0x85, 0x8f, 0x02,
-	0x0b, 0x0a, 0x09, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x32, 0x94, 0x04, 0x0a,
-	0x15, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x9c, 0x01, 0x0a, 0x0c, 0x50, 0x61, 0x75, 0x73, 0x65,
-	0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x12, 0x2a, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69,
-	0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
-	0x50, 0x61, 0x75, 0x73, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-	0x2e, 0x76, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x50, 0x61, 0x75, 0x73,
-	0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x33, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2d, 0x3a, 0x01, 0x2a, 0x22, 0x28, 0x2f, 0x74, 0x72,
-	0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-	0x2f, 0x63, 0x2f, 0x7b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x7d, 0x2f,
-	0x70, 0x61, 0x75, 0x73, 0x65, 0x12, 0xa0, 0x01, 0x0a, 0x0d, 0x52, 0x65, 0x73, 0x75, 0x6d, 0x65,
-	0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x12, 0x2b, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69,
-	0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
-	0x52, 0x65, 0x73, 0x75, 0x6d, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65,
-	0x72, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73,
-	0x75, 0x6d, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x34, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2e, 0x3a, 0x01, 0x2a, 0x22, 0x29, 0x2f,
+	0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x3a, 0xc2, 0xff, 0x8e, 0x02, 0x04, 0x52, 0x02, 0x18, 0x01, 0x82, 0xd3, 0xe4, 0x93, 0x02,
+	0x2b, 0x12, 0x29, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74,
+	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x71, 0x2f, 0x7b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65,
+	0x72, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x1a, 0x10, 0xea, 0x85,
+	0x8f, 0x02, 0x0b, 0x0a, 0x09, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x32, 0x94,
+	0x04, 0x0a, 0x15, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e,
+	0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x9c, 0x01, 0x0a, 0x0c, 0x50, 0x61, 0x75,
+	0x73, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x12, 0x2a, 0x2e, 0x6f, 0x35, 0x2e, 0x74,
+	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2e, 0x50, 0x61, 0x75, 0x73, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67,
+	0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x50, 0x61,
+	0x75, 0x73, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x33, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2d, 0x3a, 0x01, 0x2a, 0x22, 0x28, 0x2f,
 	0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67,
 	0x65, 0x72, 0x2f, 0x63, 0x2f, 0x7b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64,
-	0x7d, 0x2f, 0x72, 0x65, 0x73, 0x75, 0x6d, 0x65, 0x12, 0xa6, 0x01, 0x0a, 0x0f, 0x4d, 0x61, 0x6e,
-	0x75, 0x61, 0x6c, 0x6c, 0x79, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x12, 0x2d, 0x2e, 0x6f,
-	0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x2e, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x6c, 0x79, 0x54, 0x72, 0x69,
-	0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x6f, 0x35,
-	0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x2e, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x6c, 0x79, 0x54, 0x72, 0x69, 0x67,
-	0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x34, 0x82, 0xd3, 0xe4,
-	0x93, 0x02, 0x2e, 0x3a, 0x01, 0x2a, 0x22, 0x29, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-	0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x63, 0x2f, 0x7b, 0x74,
-	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6d, 0x61, 0x6e, 0x75, 0x61,
-	0x6c, 0x1a, 0x10, 0xea, 0x85, 0x8f, 0x02, 0x0b, 0x12, 0x09, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x67,
-	0x67, 0x65, 0x72, 0x42, 0x3a, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
-	0x6d, 0x2f, 0x70, 0x65, 0x6e, 0x74, 0x6f, 0x70, 0x73, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65,
-	0x72, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x6f, 0x35, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-	0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x62, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x7d, 0x2f, 0x70, 0x61, 0x75, 0x73, 0x65, 0x12, 0xa0, 0x01, 0x0a, 0x0d, 0x52, 0x65, 0x73, 0x75,
+	0x6d, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x12, 0x2b, 0x2e, 0x6f, 0x35, 0x2e, 0x74,
+	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6d, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67,
+	0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x52,
+	0x65, 0x73, 0x75, 0x6d, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x34, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2e, 0x3a, 0x01, 0x2a, 0x22,
+	0x29, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x2f, 0x63, 0x2f, 0x7b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f,
+	0x69, 0x64, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x75, 0x6d, 0x65, 0x12, 0xa6, 0x01, 0x0a, 0x0f, 0x4d,
+	0x61, 0x6e, 0x75, 0x61, 0x6c, 0x6c, 0x79, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x12, 0x2d,
+	0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x6c, 0x79, 0x54,
+	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e,
+	0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x6c, 0x79, 0x54, 0x72,
+	0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x34, 0x82,
+	0xd3, 0xe4, 0x93, 0x02, 0x2e, 0x3a, 0x01, 0x2a, 0x22, 0x29, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67,
+	0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x63, 0x2f,
+	0x7b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6d, 0x61, 0x6e,
+	0x75, 0x61, 0x6c, 0x1a, 0x10, 0xea, 0x85, 0x8f, 0x02, 0x0b, 0x12, 0x09, 0x0a, 0x07, 0x74, 0x72,
+	0x69, 0x67, 0x67, 0x65, 0x72, 0x42, 0x3a, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x65, 0x6e, 0x74, 0x6f, 0x70, 0x73, 0x2f, 0x74, 0x72, 0x69, 0x67,
+	0x67, 0x65, 0x72, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x6f, 0x35, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67,
+	0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x73, 0x70,
+	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/gen/o5/trigger/v1/trigger_spb/trigger.p.j5s_j5.pb.go b/gen/o5/trigger/v1/trigger_spb/trigger.p.j5s_j5.pb.go
index c05eb91..df24990 100644
--- a/gen/o5/trigger/v1/trigger_spb/trigger.p.j5s_j5.pb.go
+++ b/gen/o5/trigger/v1/trigger_spb/trigger.p.j5s_j5.pb.go
@@ -4,7 +4,6 @@ package trigger_spb
 
 import (
 	j5reflect "github.com/pentops/j5/lib/j5reflect"
-	j5schema "github.com/pentops/j5/lib/j5schema"
 	proto "google.golang.org/protobuf/proto"
 )
 
@@ -139,51 +138,3 @@ func (msg *ManuallyTriggerResponse) J5Reflect() j5reflect.Root {
 func (msg *ManuallyTriggerResponse) J5Object() j5reflect.Object {
 	return j5reflect.MustReflect(msg.ProtoReflect()).(j5reflect.Object)
 }
-
-// TriggerGet is a J5 method for service TriggerQueryService
-func TriggerGetJ5MethodSchema() *j5schema.MethodSchema {
-	return &j5schema.MethodSchema{
-		Request:  j5schema.MustObjectSchema((&TriggerGetRequest{}).ProtoReflect().Descriptor()),
-		Response: j5schema.MustObjectSchema((&TriggerGetResponse{}).ProtoReflect().Descriptor()),
-	}
-}
-
-// TriggerList is a J5 method for service TriggerQueryService
-func TriggerListJ5MethodSchema() *j5schema.MethodSchema {
-	return &j5schema.MethodSchema{
-		Request:  j5schema.MustObjectSchema((&TriggerListRequest{}).ProtoReflect().Descriptor()),
-		Response: j5schema.MustObjectSchema((&TriggerListResponse{}).ProtoReflect().Descriptor()),
-	}
-}
-
-// TriggerEvents is a J5 method for service TriggerQueryService
-func TriggerEventsJ5MethodSchema() *j5schema.MethodSchema {
-	return &j5schema.MethodSchema{
-		Request:  j5schema.MustObjectSchema((&TriggerEventsRequest{}).ProtoReflect().Descriptor()),
-		Response: j5schema.MustObjectSchema((&TriggerEventsResponse{}).ProtoReflect().Descriptor()),
-	}
-}
-
-// PauseTrigger is a J5 method for service TriggerCommandService
-func PauseTriggerJ5MethodSchema() *j5schema.MethodSchema {
-	return &j5schema.MethodSchema{
-		Request:  j5schema.MustObjectSchema((&PauseTriggerRequest{}).ProtoReflect().Descriptor()),
-		Response: j5schema.MustObjectSchema((&PauseTriggerResponse{}).ProtoReflect().Descriptor()),
-	}
-}
-
-// ResumeTrigger is a J5 method for service TriggerCommandService
-func ResumeTriggerJ5MethodSchema() *j5schema.MethodSchema {
-	return &j5schema.MethodSchema{
-		Request:  j5schema.MustObjectSchema((&ResumeTriggerRequest{}).ProtoReflect().Descriptor()),
-		Response: j5schema.MustObjectSchema((&ResumeTriggerResponse{}).ProtoReflect().Descriptor()),
-	}
-}
-
-// ManuallyTrigger is a J5 method for service TriggerCommandService
-func ManuallyTriggerJ5MethodSchema() *j5schema.MethodSchema {
-	return &j5schema.MethodSchema{
-		Request:  j5schema.MustObjectSchema((&ManuallyTriggerRequest{}).ProtoReflect().Descriptor()),
-		Response: j5schema.MustObjectSchema((&ManuallyTriggerResponse{}).ProtoReflect().Descriptor()),
-	}
-}
diff --git a/gen/o5/trigger/v1/trigger_tpb/tick_j5.pb.go b/gen/o5/trigger/v1/trigger_tpb/tick_j5.pb.go
index 378bcae..023723d 100644
--- a/gen/o5/trigger/v1/trigger_tpb/tick_j5.pb.go
+++ b/gen/o5/trigger/v1/trigger_tpb/tick_j5.pb.go
@@ -4,9 +4,7 @@ package trigger_tpb
 
 import (
 	j5reflect "github.com/pentops/j5/lib/j5reflect"
-	j5schema "github.com/pentops/j5/lib/j5schema"
 	proto "google.golang.org/protobuf/proto"
-	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func (msg *SelfTickMessage) Clone() any {
@@ -19,11 +17,3 @@ func (msg *SelfTickMessage) J5Reflect() j5reflect.Root {
 func (msg *SelfTickMessage) J5Object() j5reflect.Object {
 	return j5reflect.MustReflect(msg.ProtoReflect()).(j5reflect.Object)
 }
-
-// SelfTick is a J5 method for service SelfTickTopic
-func SelfTickJ5MethodSchema() *j5schema.MethodSchema {
-	return &j5schema.MethodSchema{
-		Request:  j5schema.MustObjectSchema((&SelfTickMessage{}).ProtoReflect().Descriptor()),
-		Response: j5schema.MustObjectSchema((&emptypb.Empty{}).ProtoReflect().Descriptor()),
-	}
-}
diff --git a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s.pb.go b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s.pb.go
index b561fae..d545515 100644
--- a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s.pb.go
+++ b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s.pb.go
@@ -106,7 +106,7 @@ func (x *TriggerEventMessage) GetStatus() trigger_pb.TriggerStatus {
 	return trigger_pb.TriggerStatus(0)
 }
 
-type TickRequestMessage struct {
+type TriggerManageRequestMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -115,8 +115,8 @@ type TickRequestMessage struct {
 	Action  *trigger_pb.ActionType          `protobuf:"bytes,2,opt,name=action,proto3" json:"action,omitempty"`
 }
 
-func (x *TickRequestMessage) Reset() {
-	*x = TickRequestMessage{}
+func (x *TriggerManageRequestMessage) Reset() {
+	*x = TriggerManageRequestMessage{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_o5_trigger_v1_topic_trigger_p_j5s_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -124,13 +124,13 @@ func (x *TickRequestMessage) Reset() {
 	}
 }
 
-func (x *TickRequestMessage) String() string {
+func (x *TriggerManageRequestMessage) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*TickRequestMessage) ProtoMessage() {}
+func (*TriggerManageRequestMessage) ProtoMessage() {}
 
-func (x *TickRequestMessage) ProtoReflect() protoreflect.Message {
+func (x *TriggerManageRequestMessage) ProtoReflect() protoreflect.Message {
 	mi := &file_o5_trigger_v1_topic_trigger_p_j5s_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -142,26 +142,26 @@ func (x *TickRequestMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TickRequestMessage.ProtoReflect.Descriptor instead.
-func (*TickRequestMessage) Descriptor() ([]byte, []int) {
+// Deprecated: Use TriggerManageRequestMessage.ProtoReflect.Descriptor instead.
+func (*TriggerManageRequestMessage) Descriptor() ([]byte, []int) {
 	return file_o5_trigger_v1_topic_trigger_p_j5s_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *TickRequestMessage) GetRequest() *messaging_j5pb.RequestMetadata {
+func (x *TriggerManageRequestMessage) GetRequest() *messaging_j5pb.RequestMetadata {
 	if x != nil {
 		return x.Request
 	}
 	return nil
 }
 
-func (x *TickRequestMessage) GetAction() *trigger_pb.ActionType {
+func (x *TriggerManageRequestMessage) GetAction() *trigger_pb.ActionType {
 	if x != nil {
 		return x.Action
 	}
 	return nil
 }
 
-type TickReplyMessage struct {
+type TriggerManageReplyMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -171,8 +171,8 @@ type TickReplyMessage struct {
 	TickTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=tick_time,json=tickTime,proto3" json:"tick_time,omitempty"`
 }
 
-func (x *TickReplyMessage) Reset() {
-	*x = TickReplyMessage{}
+func (x *TriggerManageReplyMessage) Reset() {
+	*x = TriggerManageReplyMessage{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_o5_trigger_v1_topic_trigger_p_j5s_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -180,13 +180,13 @@ func (x *TickReplyMessage) Reset() {
 	}
 }
 
-func (x *TickReplyMessage) String() string {
+func (x *TriggerManageReplyMessage) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*TickReplyMessage) ProtoMessage() {}
+func (*TriggerManageReplyMessage) ProtoMessage() {}
 
-func (x *TickReplyMessage) ProtoReflect() protoreflect.Message {
+func (x *TriggerManageReplyMessage) ProtoReflect() protoreflect.Message {
 	mi := &file_o5_trigger_v1_topic_trigger_p_j5s_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -198,19 +198,19 @@ func (x *TickReplyMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TickReplyMessage.ProtoReflect.Descriptor instead.
-func (*TickReplyMessage) Descriptor() ([]byte, []int) {
+// Deprecated: Use TriggerManageReplyMessage.ProtoReflect.Descriptor instead.
+func (*TriggerManageReplyMessage) Descriptor() ([]byte, []int) {
 	return file_o5_trigger_v1_topic_trigger_p_j5s_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *TickReplyMessage) GetRequest() *messaging_j5pb.RequestMetadata {
+func (x *TriggerManageReplyMessage) GetRequest() *messaging_j5pb.RequestMetadata {
 	if x != nil {
 		return x.Request
 	}
 	return nil
 }
 
-func (x *TickReplyMessage) GetTickTime() *timestamppb.Timestamp {
+func (x *TriggerManageReplyMessage) GetTickTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.TickTime
 	}
@@ -263,57 +263,62 @@ var file_o5_trigger_v1_topic_trigger_p_j5s_proto_rawDesc = []byte{
 	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x12, 0xba, 0x48,
 	0x08, 0xc8, 0x01, 0x01, 0x82, 0x01, 0x02, 0x10, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x5a, 0x00,
 	0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52,
-	0x00, 0x22, 0xaa, 0x01, 0x0a, 0x12, 0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x49, 0x0a, 0x07, 0x72, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6a, 0x35, 0x2e, 0x6d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x0d, 0xba, 0x48, 0x03,
-	0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x07, 0x72, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x40, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-	0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x42, 0x0d,
-	0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x62, 0x00, 0x52, 0x06, 0x61,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22, 0xaf,
-	0x01, 0x0a, 0x10, 0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x12, 0x49, 0x0a, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6a, 0x35, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x65,
-	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x0d, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff,
-	0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x47,
-	0x0a, 0x09, 0x74, 0x69, 0x63, 0x6b, 0x5f, 0x74, 0x69, 0x6d, 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, 0x42, 0x0e, 0xba,
-	0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xaa, 0x02, 0x00, 0x52, 0x08, 0x74,
-	0x69, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00,
-	0x32, 0x99, 0x01, 0x0a, 0x13, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x50, 0x75, 0x62, 0x6c,
-	0x69, 0x73, 0x68, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x50, 0x0a, 0x0c, 0x54, 0x72, 0x69, 0x67,
-	0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72,
-	0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x2e, 0x54,
-	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x30, 0xda, 0xa2, 0xf5, 0xe4,
-	0x02, 0x2a, 0x0a, 0x0f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x70, 0x75, 0x62, 0x6c,
-	0x69, 0x73, 0x68, 0x6a, 0x17, 0x0a, 0x15, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65,
-	0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x32, 0x72, 0x0a, 0x10,
-	0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x6f, 0x70, 0x69, 0x63,
-	0x12, 0x4e, 0x0a, 0x0b, 0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x27, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e,
-	0x74, 0x6f, 0x70, 0x69, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79,
-	0x1a, 0x0e, 0xda, 0xa2, 0xf5, 0xe4, 0x02, 0x08, 0x0a, 0x04, 0x74, 0x69, 0x63, 0x6b, 0x5a, 0x00,
-	0x32, 0x6c, 0x0a, 0x0e, 0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x54, 0x6f, 0x70,
-	0x69, 0x63, 0x12, 0x4a, 0x0a, 0x09, 0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
-	0x25, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e,
-	0x74, 0x6f, 0x70, 0x69, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x4d,
+	0x00, 0x22, 0xb3, 0x01, 0x0a, 0x1b, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4d, 0x61, 0x6e,
+	0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x65, 0x12, 0x49, 0x0a, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6a, 0x35, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x69, 0x6e,
+	0x67, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x74, 0x61,
+	0x64, 0x61, 0x74, 0x61, 0x42, 0x0d, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02,
+	0x02, 0x52, 0x00, 0x52, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x40, 0x0a, 0x06,
+	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6f,
+	0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x42, 0x0d, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2,
+	0xff, 0x8e, 0x02, 0x02, 0x62, 0x00, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x07,
+	0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22, 0xb8, 0x01, 0x0a, 0x19, 0x54, 0x72, 0x69, 0x67,
+	0x67, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x4d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x49, 0x0a, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6a, 0x35, 0x2e, 0x6d, 0x65, 0x73, 0x73,
+	0x61, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x0d, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01,
+	0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x47, 0x0a, 0x09, 0x74, 0x69, 0x63, 0x6b, 0x5f, 0x74, 0x69, 0x6d, 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, 0x42,
+	0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xaa, 0x02, 0x00, 0x52,
+	0x08, 0x74, 0x69, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02,
+	0x52, 0x00, 0x32, 0x99, 0x01, 0x0a, 0x13, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x50, 0x75,
+	0x62, 0x6c, 0x69, 0x73, 0x68, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x50, 0x0a, 0x0c, 0x54, 0x72,
+	0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x6f, 0x35, 0x2e,
+	0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x74, 0x6f, 0x70, 0x69, 0x63,
+	0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x73,
+	0x73, 0x61, 0x67, 0x65, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x30, 0xda, 0xa2,
+	0xf5, 0xe4, 0x02, 0x2a, 0x0a, 0x0f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x70, 0x75,
+	0x62, 0x6c, 0x69, 0x73, 0x68, 0x6a, 0x17, 0x0a, 0x15, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67,
+	0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x32, 0x97,
+	0x01, 0x0a, 0x19, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x60, 0x0a, 0x14,
+	0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x30, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65,
+	0x72, 0x2e, 0x76, 0x31, 0x2e, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67,
+	0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d,
 	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x0e,
-	0xda, 0xa2, 0xf5, 0xe4, 0x02, 0x08, 0x0a, 0x04, 0x74, 0x69, 0x63, 0x6b, 0x62, 0x00, 0x42, 0x3a,
-	0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x65, 0x6e,
-	0x74, 0x6f, 0x70, 0x73, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x67, 0x65, 0x6e,
-	0x2f, 0x6f, 0x35, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74,
-	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x74, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x18,
+	0xda, 0xa2, 0xf5, 0xe4, 0x02, 0x12, 0x0a, 0x0e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f,
+	0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x5a, 0x00, 0x32, 0x91, 0x01, 0x0a, 0x17, 0x54, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x54,
+	0x6f, 0x70, 0x69, 0x63, 0x12, 0x5c, 0x0a, 0x12, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4d,
+	0x61, 0x6e, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x2e, 0x2e, 0x6f, 0x35, 0x2e,
+	0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x74, 0x6f, 0x70, 0x69, 0x63,
+	0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x52, 0x65,
+	0x70, 0x6c, 0x79, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70,
+	0x74, 0x79, 0x1a, 0x18, 0xda, 0xa2, 0xf5, 0xe4, 0x02, 0x12, 0x0a, 0x0e, 0x74, 0x72, 0x69, 0x67,
+	0x67, 0x65, 0x72, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x62, 0x00, 0x42, 0x3a, 0x5a, 0x38,
+	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x65, 0x6e, 0x74, 0x6f,
+	0x70, 0x73, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x6f,
+	0x35, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x5f, 0x74, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -331,8 +336,8 @@ func file_o5_trigger_v1_topic_trigger_p_j5s_proto_rawDescGZIP() []byte {
 var file_o5_trigger_v1_topic_trigger_p_j5s_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_o5_trigger_v1_topic_trigger_p_j5s_proto_goTypes = []interface{}{
 	(*TriggerEventMessage)(nil),            // 0: o5.trigger.v1.topic.TriggerEventMessage
-	(*TickRequestMessage)(nil),             // 1: o5.trigger.v1.topic.TickRequestMessage
-	(*TickReplyMessage)(nil),               // 2: o5.trigger.v1.topic.TickReplyMessage
+	(*TriggerManageRequestMessage)(nil),    // 1: o5.trigger.v1.topic.TriggerManageRequestMessage
+	(*TriggerManageReplyMessage)(nil),      // 2: o5.trigger.v1.topic.TriggerManageReplyMessage
 	(*psm_j5pb.EventPublishMetadata)(nil),  // 3: j5.state.v1.EventPublishMetadata
 	(*trigger_pb.TriggerKeys)(nil),         // 4: o5.trigger.v1.TriggerKeys
 	(*trigger_pb.TriggerEventType)(nil),    // 5: o5.trigger.v1.TriggerEventType
@@ -349,16 +354,16 @@ var file_o5_trigger_v1_topic_trigger_p_j5s_proto_depIdxs = []int32{
 	5,  // 2: o5.trigger.v1.topic.TriggerEventMessage.event:type_name -> o5.trigger.v1.TriggerEventType
 	6,  // 3: o5.trigger.v1.topic.TriggerEventMessage.data:type_name -> o5.trigger.v1.TriggerData
 	7,  // 4: o5.trigger.v1.topic.TriggerEventMessage.status:type_name -> o5.trigger.v1.TriggerStatus
-	8,  // 5: o5.trigger.v1.topic.TickRequestMessage.request:type_name -> j5.messaging.v1.RequestMetadata
-	9,  // 6: o5.trigger.v1.topic.TickRequestMessage.action:type_name -> o5.trigger.v1.ActionType
-	8,  // 7: o5.trigger.v1.topic.TickReplyMessage.request:type_name -> j5.messaging.v1.RequestMetadata
-	10, // 8: o5.trigger.v1.topic.TickReplyMessage.tick_time:type_name -> google.protobuf.Timestamp
+	8,  // 5: o5.trigger.v1.topic.TriggerManageRequestMessage.request:type_name -> j5.messaging.v1.RequestMetadata
+	9,  // 6: o5.trigger.v1.topic.TriggerManageRequestMessage.action:type_name -> o5.trigger.v1.ActionType
+	8,  // 7: o5.trigger.v1.topic.TriggerManageReplyMessage.request:type_name -> j5.messaging.v1.RequestMetadata
+	10, // 8: o5.trigger.v1.topic.TriggerManageReplyMessage.tick_time:type_name -> google.protobuf.Timestamp
 	0,  // 9: o5.trigger.v1.topic.TriggerPublishTopic.TriggerEvent:input_type -> o5.trigger.v1.topic.TriggerEventMessage
-	1,  // 10: o5.trigger.v1.topic.TickRequestTopic.TickRequest:input_type -> o5.trigger.v1.topic.TickRequestMessage
-	2,  // 11: o5.trigger.v1.topic.TickReplyTopic.TickReply:input_type -> o5.trigger.v1.topic.TickReplyMessage
+	1,  // 10: o5.trigger.v1.topic.TriggerManageRequestTopic.TriggerManageRequest:input_type -> o5.trigger.v1.topic.TriggerManageRequestMessage
+	2,  // 11: o5.trigger.v1.topic.TriggerManageReplyTopic.TriggerManageReply:input_type -> o5.trigger.v1.topic.TriggerManageReplyMessage
 	11, // 12: o5.trigger.v1.topic.TriggerPublishTopic.TriggerEvent:output_type -> google.protobuf.Empty
-	11, // 13: o5.trigger.v1.topic.TickRequestTopic.TickRequest:output_type -> google.protobuf.Empty
-	11, // 14: o5.trigger.v1.topic.TickReplyTopic.TickReply:output_type -> google.protobuf.Empty
+	11, // 13: o5.trigger.v1.topic.TriggerManageRequestTopic.TriggerManageRequest:output_type -> google.protobuf.Empty
+	11, // 14: o5.trigger.v1.topic.TriggerManageReplyTopic.TriggerManageReply:output_type -> google.protobuf.Empty
 	12, // [12:15] is the sub-list for method output_type
 	9,  // [9:12] is the sub-list for method input_type
 	9,  // [9:9] is the sub-list for extension type_name
@@ -385,7 +390,7 @@ func file_o5_trigger_v1_topic_trigger_p_j5s_proto_init() {
 			}
 		}
 		file_o5_trigger_v1_topic_trigger_p_j5s_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TickRequestMessage); i {
+			switch v := v.(*TriggerManageRequestMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -397,7 +402,7 @@ func file_o5_trigger_v1_topic_trigger_p_j5s_proto_init() {
 			}
 		}
 		file_o5_trigger_v1_topic_trigger_p_j5s_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TickReplyMessage); i {
+			switch v := v.(*TriggerManageReplyMessage); i {
 			case 0:
 				return &v.state
 			case 1:
diff --git a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_grpc.pb.go b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_grpc.pb.go
index b3ae62c..dadefff 100644
--- a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_grpc.pb.go
+++ b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_grpc.pb.go
@@ -110,89 +110,90 @@ var TriggerPublishTopic_ServiceDesc = grpc.ServiceDesc{
 }
 
 const (
-	TickRequestTopic_TickRequest_FullMethodName = "/o5.trigger.v1.topic.TickRequestTopic/TickRequest"
+	TriggerManageRequestTopic_TriggerManageRequest_FullMethodName = "/o5.trigger.v1.topic.TriggerManageRequestTopic/TriggerManageRequest"
 )
 
-// TickRequestTopicClient is the client API for TickRequestTopic service.
+// TriggerManageRequestTopicClient is the client API for TriggerManageRequestTopic service.
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type TickRequestTopicClient interface {
-	TickRequest(ctx context.Context, in *TickRequestMessage, opts ...grpc.CallOption) (*emptypb.Empty, error)
+type TriggerManageRequestTopicClient interface {
+	TriggerManageRequest(ctx context.Context, in *TriggerManageRequestMessage, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
-type tickRequestTopicClient struct {
+type triggerManageRequestTopicClient struct {
 	cc grpc.ClientConnInterface
 }
 
-func NewTickRequestTopicClient(cc grpc.ClientConnInterface) TickRequestTopicClient {
-	return &tickRequestTopicClient{cc}
+func NewTriggerManageRequestTopicClient(cc grpc.ClientConnInterface) TriggerManageRequestTopicClient {
+	return &triggerManageRequestTopicClient{cc}
 }
 
-func (c *tickRequestTopicClient) TickRequest(ctx context.Context, in *TickRequestMessage, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+func (c *triggerManageRequestTopicClient) TriggerManageRequest(ctx context.Context, in *TriggerManageRequestMessage, opts ...grpc.CallOption) (*emptypb.Empty, error) {
 	out := new(emptypb.Empty)
-	err := c.cc.Invoke(ctx, TickRequestTopic_TickRequest_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, TriggerManageRequestTopic_TriggerManageRequest_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// TickRequestTopicServer is the server API for TickRequestTopic service.
-// All implementations must embed UnimplementedTickRequestTopicServer
+// TriggerManageRequestTopicServer is the server API for TriggerManageRequestTopic service.
+// All implementations must embed UnimplementedTriggerManageRequestTopicServer
 // for forward compatibility
-type TickRequestTopicServer interface {
-	TickRequest(context.Context, *TickRequestMessage) (*emptypb.Empty, error)
-	mustEmbedUnimplementedTickRequestTopicServer()
+type TriggerManageRequestTopicServer interface {
+	TriggerManageRequest(context.Context, *TriggerManageRequestMessage) (*emptypb.Empty, error)
+	mustEmbedUnimplementedTriggerManageRequestTopicServer()
 }
 
-// UnimplementedTickRequestTopicServer must be embedded to have forward compatible implementations.
-type UnimplementedTickRequestTopicServer struct {
+// UnimplementedTriggerManageRequestTopicServer must be embedded to have forward compatible implementations.
+type UnimplementedTriggerManageRequestTopicServer struct {
 }
 
-func (UnimplementedTickRequestTopicServer) TickRequest(context.Context, *TickRequestMessage) (*emptypb.Empty, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method TickRequest not implemented")
+func (UnimplementedTriggerManageRequestTopicServer) TriggerManageRequest(context.Context, *TriggerManageRequestMessage) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method TriggerManageRequest not implemented")
+}
+func (UnimplementedTriggerManageRequestTopicServer) mustEmbedUnimplementedTriggerManageRequestTopicServer() {
 }
-func (UnimplementedTickRequestTopicServer) mustEmbedUnimplementedTickRequestTopicServer() {}
 
-// UnsafeTickRequestTopicServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to TickRequestTopicServer will
+// UnsafeTriggerManageRequestTopicServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to TriggerManageRequestTopicServer will
 // result in compilation errors.
-type UnsafeTickRequestTopicServer interface {
-	mustEmbedUnimplementedTickRequestTopicServer()
+type UnsafeTriggerManageRequestTopicServer interface {
+	mustEmbedUnimplementedTriggerManageRequestTopicServer()
 }
 
-func RegisterTickRequestTopicServer(s grpc.ServiceRegistrar, srv TickRequestTopicServer) {
-	s.RegisterService(&TickRequestTopic_ServiceDesc, srv)
+func RegisterTriggerManageRequestTopicServer(s grpc.ServiceRegistrar, srv TriggerManageRequestTopicServer) {
+	s.RegisterService(&TriggerManageRequestTopic_ServiceDesc, srv)
 }
 
-func _TickRequestTopic_TickRequest_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TickRequestMessage)
+func _TriggerManageRequestTopic_TriggerManageRequest_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(TriggerManageRequestMessage)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(TickRequestTopicServer).TickRequest(ctx, in)
+		return srv.(TriggerManageRequestTopicServer).TriggerManageRequest(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: TickRequestTopic_TickRequest_FullMethodName,
+		FullMethod: TriggerManageRequestTopic_TriggerManageRequest_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TickRequestTopicServer).TickRequest(ctx, req.(*TickRequestMessage))
+		return srv.(TriggerManageRequestTopicServer).TriggerManageRequest(ctx, req.(*TriggerManageRequestMessage))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-// TickRequestTopic_ServiceDesc is the grpc.ServiceDesc for TickRequestTopic service.
+// TriggerManageRequestTopic_ServiceDesc is the grpc.ServiceDesc for TriggerManageRequestTopic service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
-var TickRequestTopic_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "o5.trigger.v1.topic.TickRequestTopic",
-	HandlerType: (*TickRequestTopicServer)(nil),
+var TriggerManageRequestTopic_ServiceDesc = grpc.ServiceDesc{
+	ServiceName: "o5.trigger.v1.topic.TriggerManageRequestTopic",
+	HandlerType: (*TriggerManageRequestTopicServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
-			MethodName: "TickRequest",
-			Handler:    _TickRequestTopic_TickRequest_Handler,
+			MethodName: "TriggerManageRequest",
+			Handler:    _TriggerManageRequestTopic_TriggerManageRequest_Handler,
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
@@ -200,89 +201,90 @@ var TickRequestTopic_ServiceDesc = grpc.ServiceDesc{
 }
 
 const (
-	TickReplyTopic_TickReply_FullMethodName = "/o5.trigger.v1.topic.TickReplyTopic/TickReply"
+	TriggerManageReplyTopic_TriggerManageReply_FullMethodName = "/o5.trigger.v1.topic.TriggerManageReplyTopic/TriggerManageReply"
 )
 
-// TickReplyTopicClient is the client API for TickReplyTopic service.
+// TriggerManageReplyTopicClient is the client API for TriggerManageReplyTopic service.
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type TickReplyTopicClient interface {
-	TickReply(ctx context.Context, in *TickReplyMessage, opts ...grpc.CallOption) (*emptypb.Empty, error)
+type TriggerManageReplyTopicClient interface {
+	TriggerManageReply(ctx context.Context, in *TriggerManageReplyMessage, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
-type tickReplyTopicClient struct {
+type triggerManageReplyTopicClient struct {
 	cc grpc.ClientConnInterface
 }
 
-func NewTickReplyTopicClient(cc grpc.ClientConnInterface) TickReplyTopicClient {
-	return &tickReplyTopicClient{cc}
+func NewTriggerManageReplyTopicClient(cc grpc.ClientConnInterface) TriggerManageReplyTopicClient {
+	return &triggerManageReplyTopicClient{cc}
 }
 
-func (c *tickReplyTopicClient) TickReply(ctx context.Context, in *TickReplyMessage, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+func (c *triggerManageReplyTopicClient) TriggerManageReply(ctx context.Context, in *TriggerManageReplyMessage, opts ...grpc.CallOption) (*emptypb.Empty, error) {
 	out := new(emptypb.Empty)
-	err := c.cc.Invoke(ctx, TickReplyTopic_TickReply_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, TriggerManageReplyTopic_TriggerManageReply_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// TickReplyTopicServer is the server API for TickReplyTopic service.
-// All implementations must embed UnimplementedTickReplyTopicServer
+// TriggerManageReplyTopicServer is the server API for TriggerManageReplyTopic service.
+// All implementations must embed UnimplementedTriggerManageReplyTopicServer
 // for forward compatibility
-type TickReplyTopicServer interface {
-	TickReply(context.Context, *TickReplyMessage) (*emptypb.Empty, error)
-	mustEmbedUnimplementedTickReplyTopicServer()
+type TriggerManageReplyTopicServer interface {
+	TriggerManageReply(context.Context, *TriggerManageReplyMessage) (*emptypb.Empty, error)
+	mustEmbedUnimplementedTriggerManageReplyTopicServer()
 }
 
-// UnimplementedTickReplyTopicServer must be embedded to have forward compatible implementations.
-type UnimplementedTickReplyTopicServer struct {
+// UnimplementedTriggerManageReplyTopicServer must be embedded to have forward compatible implementations.
+type UnimplementedTriggerManageReplyTopicServer struct {
 }
 
-func (UnimplementedTickReplyTopicServer) TickReply(context.Context, *TickReplyMessage) (*emptypb.Empty, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method TickReply not implemented")
+func (UnimplementedTriggerManageReplyTopicServer) TriggerManageReply(context.Context, *TriggerManageReplyMessage) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method TriggerManageReply not implemented")
+}
+func (UnimplementedTriggerManageReplyTopicServer) mustEmbedUnimplementedTriggerManageReplyTopicServer() {
 }
-func (UnimplementedTickReplyTopicServer) mustEmbedUnimplementedTickReplyTopicServer() {}
 
-// UnsafeTickReplyTopicServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to TickReplyTopicServer will
+// UnsafeTriggerManageReplyTopicServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to TriggerManageReplyTopicServer will
 // result in compilation errors.
-type UnsafeTickReplyTopicServer interface {
-	mustEmbedUnimplementedTickReplyTopicServer()
+type UnsafeTriggerManageReplyTopicServer interface {
+	mustEmbedUnimplementedTriggerManageReplyTopicServer()
 }
 
-func RegisterTickReplyTopicServer(s grpc.ServiceRegistrar, srv TickReplyTopicServer) {
-	s.RegisterService(&TickReplyTopic_ServiceDesc, srv)
+func RegisterTriggerManageReplyTopicServer(s grpc.ServiceRegistrar, srv TriggerManageReplyTopicServer) {
+	s.RegisterService(&TriggerManageReplyTopic_ServiceDesc, srv)
 }
 
-func _TickReplyTopic_TickReply_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TickReplyMessage)
+func _TriggerManageReplyTopic_TriggerManageReply_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(TriggerManageReplyMessage)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(TickReplyTopicServer).TickReply(ctx, in)
+		return srv.(TriggerManageReplyTopicServer).TriggerManageReply(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: TickReplyTopic_TickReply_FullMethodName,
+		FullMethod: TriggerManageReplyTopic_TriggerManageReply_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TickReplyTopicServer).TickReply(ctx, req.(*TickReplyMessage))
+		return srv.(TriggerManageReplyTopicServer).TriggerManageReply(ctx, req.(*TriggerManageReplyMessage))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-// TickReplyTopic_ServiceDesc is the grpc.ServiceDesc for TickReplyTopic service.
+// TriggerManageReplyTopic_ServiceDesc is the grpc.ServiceDesc for TriggerManageReplyTopic service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
-var TickReplyTopic_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "o5.trigger.v1.topic.TickReplyTopic",
-	HandlerType: (*TickReplyTopicServer)(nil),
+var TriggerManageReplyTopic_ServiceDesc = grpc.ServiceDesc{
+	ServiceName: "o5.trigger.v1.topic.TriggerManageReplyTopic",
+	HandlerType: (*TriggerManageReplyTopicServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
-			MethodName: "TickReply",
-			Handler:    _TickReplyTopic_TickReply_Handler,
+			MethodName: "TriggerManageReply",
+			Handler:    _TriggerManageReplyTopic_TriggerManageReply_Handler,
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
diff --git a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_j5.pb.go b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_j5.pb.go
index 19245d1..f392daf 100644
--- a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_j5.pb.go
+++ b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_j5.pb.go
@@ -4,9 +4,7 @@ package trigger_tpb
 
 import (
 	j5reflect "github.com/pentops/j5/lib/j5reflect"
-	j5schema "github.com/pentops/j5/lib/j5schema"
 	proto "google.golang.org/protobuf/proto"
-	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func (msg *TriggerEventMessage) Clone() any {
@@ -20,48 +18,24 @@ func (msg *TriggerEventMessage) J5Object() j5reflect.Object {
 	return j5reflect.MustReflect(msg.ProtoReflect()).(j5reflect.Object)
 }
 
-func (msg *TickRequestMessage) Clone() any {
-	return proto.Clone(msg).(*TickRequestMessage)
+func (msg *TriggerManageRequestMessage) Clone() any {
+	return proto.Clone(msg).(*TriggerManageRequestMessage)
 }
-func (msg *TickRequestMessage) J5Reflect() j5reflect.Root {
+func (msg *TriggerManageRequestMessage) J5Reflect() j5reflect.Root {
 	return j5reflect.MustReflect(msg.ProtoReflect())
 }
 
-func (msg *TickRequestMessage) J5Object() j5reflect.Object {
+func (msg *TriggerManageRequestMessage) J5Object() j5reflect.Object {
 	return j5reflect.MustReflect(msg.ProtoReflect()).(j5reflect.Object)
 }
 
-func (msg *TickReplyMessage) Clone() any {
-	return proto.Clone(msg).(*TickReplyMessage)
+func (msg *TriggerManageReplyMessage) Clone() any {
+	return proto.Clone(msg).(*TriggerManageReplyMessage)
 }
-func (msg *TickReplyMessage) J5Reflect() j5reflect.Root {
+func (msg *TriggerManageReplyMessage) J5Reflect() j5reflect.Root {
 	return j5reflect.MustReflect(msg.ProtoReflect())
 }
 
-func (msg *TickReplyMessage) J5Object() j5reflect.Object {
+func (msg *TriggerManageReplyMessage) J5Object() j5reflect.Object {
 	return j5reflect.MustReflect(msg.ProtoReflect()).(j5reflect.Object)
 }
-
-// TriggerEvent is a J5 method for service TriggerPublishTopic
-func TriggerEventJ5MethodSchema() *j5schema.MethodSchema {
-	return &j5schema.MethodSchema{
-		Request:  j5schema.MustObjectSchema((&TriggerEventMessage{}).ProtoReflect().Descriptor()),
-		Response: j5schema.MustObjectSchema((&emptypb.Empty{}).ProtoReflect().Descriptor()),
-	}
-}
-
-// TickRequest is a J5 method for service TickRequestTopic
-func TickRequestJ5MethodSchema() *j5schema.MethodSchema {
-	return &j5schema.MethodSchema{
-		Request:  j5schema.MustObjectSchema((&TickRequestMessage{}).ProtoReflect().Descriptor()),
-		Response: j5schema.MustObjectSchema((&emptypb.Empty{}).ProtoReflect().Descriptor()),
-	}
-}
-
-// TickReply is a J5 method for service TickReplyTopic
-func TickReplyJ5MethodSchema() *j5schema.MethodSchema {
-	return &j5schema.MethodSchema{
-		Request:  j5schema.MustObjectSchema((&TickReplyMessage{}).ProtoReflect().Descriptor()),
-		Response: j5schema.MustObjectSchema((&emptypb.Empty{}).ProtoReflect().Descriptor()),
-	}
-}
diff --git a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_o5_messaging.pb.go b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_o5_messaging.pb.go
index 5ab3557..ebad42b 100644
--- a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_o5_messaging.pb.go
+++ b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_o5_messaging.pb.go
@@ -95,23 +95,23 @@ func (publish TriggerPublishTopicPublisher) TriggerEvent(ctx context.Context, ms
 	return publish.publisher.Publish(ctx, msg)
 }
 
-// Service: TickRequestTopic
+// Service: TriggerManageRequestTopic
 // Expose Request Metadata
-func (msg *TickRequestMessage) SetJ5RequestMetadata(md *messaging_j5pb.RequestMetadata) {
+func (msg *TriggerManageRequestMessage) SetJ5RequestMetadata(md *messaging_j5pb.RequestMetadata) {
 	msg.Request = md
 }
-func (msg *TickRequestMessage) GetJ5RequestMetadata() *messaging_j5pb.RequestMetadata {
+func (msg *TriggerManageRequestMessage) GetJ5RequestMetadata() *messaging_j5pb.RequestMetadata {
 	return msg.Request
 }
 
-// Method: TickRequest
+// Method: TriggerManageRequest
 
-func (msg *TickRequestMessage) O5MessageHeader() o5msg.Header {
+func (msg *TriggerManageRequestMessage) O5MessageHeader() o5msg.Header {
 	header := o5msg.Header{
-		GrpcService:      "o5.trigger.v1.topic.TickRequestTopic",
-		GrpcMethod:       "TickRequest",
+		GrpcService:      "o5.trigger.v1.topic.TriggerManageRequestTopic",
+		GrpcMethod:       "TriggerManageRequest",
 		Headers:          map[string]string{},
-		DestinationTopic: "tick",
+		DestinationTopic: "trigger_manage",
 	}
 	if msg.Request != nil {
 		header.Extension = &messaging_pb.Message_Request_{
@@ -129,88 +129,88 @@ func (msg *TickRequestMessage) O5MessageHeader() o5msg.Header {
 	return header
 }
 
-type TickRequestTopicTxSender[C any] struct {
+type TriggerManageRequestTopicTxSender[C any] struct {
 	sender o5msg.TxSender[C]
 }
 
-func NewTickRequestTopicTxSender[C any](sender o5msg.TxSender[C]) *TickRequestTopicTxSender[C] {
+func NewTriggerManageRequestTopicTxSender[C any](sender o5msg.TxSender[C]) *TriggerManageRequestTopicTxSender[C] {
 	sender.Register(o5msg.TopicDescriptor{
-		Service: "o5.trigger.v1.topic.TickRequestTopic",
+		Service: "o5.trigger.v1.topic.TriggerManageRequestTopic",
 		Methods: []o5msg.MethodDescriptor{
 			{
-				Name:    "TickRequest",
-				Message: (*TickRequestMessage).ProtoReflect(nil).Descriptor(),
+				Name:    "TriggerManageRequest",
+				Message: (*TriggerManageRequestMessage).ProtoReflect(nil).Descriptor(),
 			},
 		},
 	})
-	return &TickRequestTopicTxSender[C]{sender: sender}
+	return &TriggerManageRequestTopicTxSender[C]{sender: sender}
 }
 
-type TickRequestTopicCollector[C any] struct {
+type TriggerManageRequestTopicCollector[C any] struct {
 	collector o5msg.Collector[C]
 }
 
-func NewTickRequestTopicCollector[C any](collector o5msg.Collector[C]) *TickRequestTopicCollector[C] {
+func NewTriggerManageRequestTopicCollector[C any](collector o5msg.Collector[C]) *TriggerManageRequestTopicCollector[C] {
 	collector.Register(o5msg.TopicDescriptor{
-		Service: "o5.trigger.v1.topic.TickRequestTopic",
+		Service: "o5.trigger.v1.topic.TriggerManageRequestTopic",
 		Methods: []o5msg.MethodDescriptor{
 			{
-				Name:    "TickRequest",
-				Message: (*TickRequestMessage).ProtoReflect(nil).Descriptor(),
+				Name:    "TriggerManageRequest",
+				Message: (*TriggerManageRequestMessage).ProtoReflect(nil).Descriptor(),
 			},
 		},
 	})
-	return &TickRequestTopicCollector[C]{collector: collector}
+	return &TriggerManageRequestTopicCollector[C]{collector: collector}
 }
 
-type TickRequestTopicPublisher struct {
+type TriggerManageRequestTopicPublisher struct {
 	publisher o5msg.Publisher
 }
 
-func NewTickRequestTopicPublisher(publisher o5msg.Publisher) *TickRequestTopicPublisher {
+func NewTriggerManageRequestTopicPublisher(publisher o5msg.Publisher) *TriggerManageRequestTopicPublisher {
 	publisher.Register(o5msg.TopicDescriptor{
-		Service: "o5.trigger.v1.topic.TickRequestTopic",
+		Service: "o5.trigger.v1.topic.TriggerManageRequestTopic",
 		Methods: []o5msg.MethodDescriptor{
 			{
-				Name:    "TickRequest",
-				Message: (*TickRequestMessage).ProtoReflect(nil).Descriptor(),
+				Name:    "TriggerManageRequest",
+				Message: (*TriggerManageRequestMessage).ProtoReflect(nil).Descriptor(),
 			},
 		},
 	})
-	return &TickRequestTopicPublisher{publisher: publisher}
+	return &TriggerManageRequestTopicPublisher{publisher: publisher}
 }
 
-// Method: TickRequest
+// Method: TriggerManageRequest
 
-func (send TickRequestTopicTxSender[C]) TickRequest(ctx context.Context, sendContext C, msg *TickRequestMessage) error {
+func (send TriggerManageRequestTopicTxSender[C]) TriggerManageRequest(ctx context.Context, sendContext C, msg *TriggerManageRequestMessage) error {
 	return send.sender.Send(ctx, sendContext, msg)
 }
 
-func (collect TickRequestTopicCollector[C]) TickRequest(sendContext C, msg *TickRequestMessage) {
+func (collect TriggerManageRequestTopicCollector[C]) TriggerManageRequest(sendContext C, msg *TriggerManageRequestMessage) {
 	collect.collector.Collect(sendContext, msg)
 }
 
-func (publish TickRequestTopicPublisher) TickRequest(ctx context.Context, msg *TickRequestMessage) error {
+func (publish TriggerManageRequestTopicPublisher) TriggerManageRequest(ctx context.Context, msg *TriggerManageRequestMessage) error {
 	return publish.publisher.Publish(ctx, msg)
 }
 
-// Service: TickReplyTopic
+// Service: TriggerManageReplyTopic
 // Expose Request Metadata
-func (msg *TickReplyMessage) SetJ5RequestMetadata(md *messaging_j5pb.RequestMetadata) {
+func (msg *TriggerManageReplyMessage) SetJ5RequestMetadata(md *messaging_j5pb.RequestMetadata) {
 	msg.Request = md
 }
-func (msg *TickReplyMessage) GetJ5RequestMetadata() *messaging_j5pb.RequestMetadata {
+func (msg *TriggerManageReplyMessage) GetJ5RequestMetadata() *messaging_j5pb.RequestMetadata {
 	return msg.Request
 }
 
-// Method: TickReply
+// Method: TriggerManageReply
 
-func (msg *TickReplyMessage) O5MessageHeader() o5msg.Header {
+func (msg *TriggerManageReplyMessage) O5MessageHeader() o5msg.Header {
 	header := o5msg.Header{
-		GrpcService:      "o5.trigger.v1.topic.TickReplyTopic",
-		GrpcMethod:       "TickReply",
+		GrpcService:      "o5.trigger.v1.topic.TriggerManageReplyTopic",
+		GrpcMethod:       "TriggerManageReply",
 		Headers:          map[string]string{},
-		DestinationTopic: "tick",
+		DestinationTopic: "trigger_manage",
 	}
 	if msg.Request != nil {
 		header.Extension = &messaging_pb.Message_Reply_{
@@ -222,67 +222,67 @@ func (msg *TickReplyMessage) O5MessageHeader() o5msg.Header {
 	return header
 }
 
-type TickReplyTopicTxSender[C any] struct {
+type TriggerManageReplyTopicTxSender[C any] struct {
 	sender o5msg.TxSender[C]
 }
 
-func NewTickReplyTopicTxSender[C any](sender o5msg.TxSender[C]) *TickReplyTopicTxSender[C] {
+func NewTriggerManageReplyTopicTxSender[C any](sender o5msg.TxSender[C]) *TriggerManageReplyTopicTxSender[C] {
 	sender.Register(o5msg.TopicDescriptor{
-		Service: "o5.trigger.v1.topic.TickReplyTopic",
+		Service: "o5.trigger.v1.topic.TriggerManageReplyTopic",
 		Methods: []o5msg.MethodDescriptor{
 			{
-				Name:    "TickReply",
-				Message: (*TickReplyMessage).ProtoReflect(nil).Descriptor(),
+				Name:    "TriggerManageReply",
+				Message: (*TriggerManageReplyMessage).ProtoReflect(nil).Descriptor(),
 			},
 		},
 	})
-	return &TickReplyTopicTxSender[C]{sender: sender}
+	return &TriggerManageReplyTopicTxSender[C]{sender: sender}
 }
 
-type TickReplyTopicCollector[C any] struct {
+type TriggerManageReplyTopicCollector[C any] struct {
 	collector o5msg.Collector[C]
 }
 
-func NewTickReplyTopicCollector[C any](collector o5msg.Collector[C]) *TickReplyTopicCollector[C] {
+func NewTriggerManageReplyTopicCollector[C any](collector o5msg.Collector[C]) *TriggerManageReplyTopicCollector[C] {
 	collector.Register(o5msg.TopicDescriptor{
-		Service: "o5.trigger.v1.topic.TickReplyTopic",
+		Service: "o5.trigger.v1.topic.TriggerManageReplyTopic",
 		Methods: []o5msg.MethodDescriptor{
 			{
-				Name:    "TickReply",
-				Message: (*TickReplyMessage).ProtoReflect(nil).Descriptor(),
+				Name:    "TriggerManageReply",
+				Message: (*TriggerManageReplyMessage).ProtoReflect(nil).Descriptor(),
 			},
 		},
 	})
-	return &TickReplyTopicCollector[C]{collector: collector}
+	return &TriggerManageReplyTopicCollector[C]{collector: collector}
 }
 
-type TickReplyTopicPublisher struct {
+type TriggerManageReplyTopicPublisher struct {
 	publisher o5msg.Publisher
 }
 
-func NewTickReplyTopicPublisher(publisher o5msg.Publisher) *TickReplyTopicPublisher {
+func NewTriggerManageReplyTopicPublisher(publisher o5msg.Publisher) *TriggerManageReplyTopicPublisher {
 	publisher.Register(o5msg.TopicDescriptor{
-		Service: "o5.trigger.v1.topic.TickReplyTopic",
+		Service: "o5.trigger.v1.topic.TriggerManageReplyTopic",
 		Methods: []o5msg.MethodDescriptor{
 			{
-				Name:    "TickReply",
-				Message: (*TickReplyMessage).ProtoReflect(nil).Descriptor(),
+				Name:    "TriggerManageReply",
+				Message: (*TriggerManageReplyMessage).ProtoReflect(nil).Descriptor(),
 			},
 		},
 	})
-	return &TickReplyTopicPublisher{publisher: publisher}
+	return &TriggerManageReplyTopicPublisher{publisher: publisher}
 }
 
-// Method: TickReply
+// Method: TriggerManageReply
 
-func (send TickReplyTopicTxSender[C]) TickReply(ctx context.Context, sendContext C, msg *TickReplyMessage) error {
+func (send TriggerManageReplyTopicTxSender[C]) TriggerManageReply(ctx context.Context, sendContext C, msg *TriggerManageReplyMessage) error {
 	return send.sender.Send(ctx, sendContext, msg)
 }
 
-func (collect TickReplyTopicCollector[C]) TickReply(sendContext C, msg *TickReplyMessage) {
+func (collect TriggerManageReplyTopicCollector[C]) TriggerManageReply(sendContext C, msg *TriggerManageReplyMessage) {
 	collect.collector.Collect(sendContext, msg)
 }
 
-func (publish TickReplyTopicPublisher) TickReply(ctx context.Context, msg *TickReplyMessage) error {
+func (publish TriggerManageReplyTopicPublisher) TriggerManageReply(ctx context.Context, msg *TriggerManageReplyMessage) error {
 	return publish.publisher.Publish(ctx, msg)
 }
diff --git a/integration/manage_trigger_test.go b/integration/manage_trigger_test.go
new file mode 100644
index 0000000..eaf2637
--- /dev/null
+++ b/integration/manage_trigger_test.go
@@ -0,0 +1,318 @@
+package integration
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	"github.com/pentops/flowtest"
+	"github.com/pentops/golib/gl"
+	"github.com/pentops/j5/gen/j5/messaging/v1/messaging_j5pb"
+	"github.com/pentops/j5/lib/id62"
+	"github.com/pentops/o5-auth/authtest"
+	"github.com/pentops/trigger/gen/o5/trigger/v1/trigger_pb"
+	"github.com/pentops/trigger/gen/o5/trigger/v1/trigger_spb"
+	"github.com/pentops/trigger/gen/o5/trigger/v1/trigger_tpb"
+)
+
+func TestTriggerManageRequest(tt *testing.T) {
+	flow, uu := NewUniverse(tt)
+	defer flow.RunSteps(tt)
+
+	triggerID := id62.NewString()
+
+	flow.Step("create trigger", func(ctx context.Context, t flowtest.Asserter) {
+		ctx = authtest.JWTContext(ctx)
+
+		req := &trigger_tpb.TriggerManageRequestMessage{
+			Request: &messaging_j5pb.RequestMetadata{
+				Context: []byte(""),
+			},
+			Action: &trigger_pb.ActionType{
+				Type: &trigger_pb.ActionType_Create_{
+					Create: &trigger_pb.ActionType_Create{
+						TriggerId:   gl.Ptr(triggerID),
+						AppName:     "test",
+						TriggerName: "TestCron",
+						Cron:        "CRON_TZ=America/New_York 0 7 * * *",
+					},
+				},
+			},
+		}
+
+		_, err := uu.TriggerWorker.TriggerManageRequest(ctx, req)
+		t.NoError(err)
+
+		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{TriggerId: triggerID})
+		t.NoError(err)
+		t.NotNil(resp)
+		t.Equal("ACTIVE", resp.Trigger.Status.ShortString())
+		t.Equal("CRON_TZ=America/New_York 0 7 * * *", resp.Trigger.Data.Cron)
+	})
+
+	flow.Step("update trigger", func(ctx context.Context, t flowtest.Asserter) {
+		ctx = authtest.JWTContext(ctx)
+
+		req := &trigger_tpb.TriggerManageRequestMessage{
+			Request: &messaging_j5pb.RequestMetadata{
+				Context: []byte(""),
+			},
+			Action: &trigger_pb.ActionType{
+				Type: &trigger_pb.ActionType_Update_{
+					Update: &trigger_pb.ActionType_Update{
+						TriggerId:   triggerID,
+						AppName:     "test",
+						TriggerName: "TestCron",
+						Cron:        "CRON_TZ=America/New_York 0 8 * * *",
+					},
+				},
+			},
+		}
+
+		_, err := uu.TriggerWorker.TriggerManageRequest(ctx, req)
+		t.NoError(err)
+
+		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{TriggerId: triggerID})
+		t.NoError(err)
+		t.NotNil(resp)
+		t.Equal("ACTIVE", resp.Trigger.Status.ShortString())
+		t.Equal("CRON_TZ=America/New_York 0 8 * * *", resp.Trigger.Data.Cron)
+	})
+
+	flow.Step("archive trigger", func(ctx context.Context, t flowtest.Asserter) {
+		ctx = authtest.JWTContext(ctx)
+
+		req := &trigger_tpb.TriggerManageRequestMessage{
+			Request: &messaging_j5pb.RequestMetadata{
+				Context: []byte(""),
+			},
+			Action: &trigger_pb.ActionType{
+				Type: &trigger_pb.ActionType_Archive_{
+					Archive: &trigger_pb.ActionType_Archive{
+						TriggerId: triggerID,
+					},
+				},
+			},
+		}
+
+		_, err := uu.TriggerWorker.TriggerManageRequest(ctx, req)
+		t.NoError(err)
+
+		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{TriggerId: triggerID})
+		t.NoError(err)
+		t.NotNil(resp)
+		t.Equal("ARCHIVED", resp.Trigger.Status.ShortString())
+	})
+}
+
+func TestActive(tt *testing.T) {
+	flow, uu := NewUniverse(tt)
+	defer flow.RunSteps(tt)
+
+	TriggerID := id62.NewString()
+
+	flow.Step("create trigger", func(ctx context.Context, t flowtest.Asserter) {
+		ctx = authtest.JWTContext(ctx)
+
+		err := uu.CreateTrigger(ctx, triggerConfig{
+			TriggerID:   TriggerID,
+			AppName:     "test",
+			TriggerName: "TestMonthlyCron",
+			Cron:        "0 18 1 * *",
+		})
+		t.NoError(err)
+
+		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{
+			TriggerId: TriggerID,
+		})
+		t.NoError(err)
+		t.NotNil(resp)
+		t.Equal("ACTIVE", resp.Trigger.Status.ShortString())
+		t.Equal("TestMonthlyCron", resp.Trigger.Data.TriggerName)
+		t.Equal("0 18 1 * *", resp.Trigger.Data.Cron)
+	})
+
+	flow.Step("update trigger", func(ctx context.Context, t flowtest.Asserter) {
+		ctx = authtest.JWTContext(ctx)
+
+		err := uu.UpdateTrigger(ctx, triggerConfig{
+			TriggerID:   TriggerID,
+			AppName:     "test",
+			TriggerName: "TestMonthlyCron",
+			Cron:        "0 20 * * *",
+		})
+		t.NoError(err)
+
+		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{
+			TriggerId: TriggerID,
+		})
+		t.NoError(err)
+		t.NotNil(resp)
+		t.Equal("ACTIVE", resp.Trigger.Status.ShortString())
+		t.Equal("TestMonthlyCron", resp.Trigger.Data.TriggerName)
+		t.Equal("0 20 * * *", resp.Trigger.Data.Cron)
+	})
+
+	flow.Step("archive trigger", func(ctx context.Context, t flowtest.Asserter) {
+		ctx = authtest.JWTContext(ctx)
+
+		err := uu.ArchiveTrigger(ctx, TriggerID)
+		t.NoError(err)
+
+		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{
+			TriggerId: TriggerID,
+		})
+		t.NoError(err)
+		t.NotNil(resp)
+		t.Equal("ARCHIVED", resp.Trigger.Status.ShortString())
+	})
+}
+
+func TestPause(tt *testing.T) {
+	flow, uu := NewUniverse(tt)
+	defer flow.RunSteps(tt)
+
+	TriggerID := id62.NewString()
+
+	flow.Step("create trigger", func(ctx context.Context, t flowtest.Asserter) {
+		err := uu.CreateTrigger(ctx, triggerConfig{
+			TriggerID:   TriggerID,
+			AppName:     "test",
+			TriggerName: "TestMonthlyCron",
+			Cron:        "0 18 1 * *",
+		})
+		t.NoError(err)
+
+		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{
+			TriggerId: TriggerID,
+		})
+		t.NoError(err)
+		t.NotNil(resp)
+		t.Equal("ACTIVE", resp.Trigger.Status.ShortString())
+		t.Equal("TestMonthlyCron", resp.Trigger.Data.TriggerName)
+		t.Equal("0 18 1 * *", resp.Trigger.Data.Cron)
+	})
+
+	flow.Step("update trigger while active", func(ctx context.Context, t flowtest.Asserter) {
+		ctx = authtest.JWTContext(ctx)
+
+		err := uu.UpdateTrigger(ctx, triggerConfig{
+			TriggerID:   TriggerID,
+			AppName:     "testUpdated",
+			TriggerName: "TestMonthlyCronUpdated",
+			Cron:        "0 20 1 * *",
+		})
+		t.NoError(err)
+
+		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{
+			TriggerId: TriggerID,
+		})
+
+		t.NoError(err)
+		t.NotNil(resp)
+		t.Equal("ACTIVE", resp.Trigger.Status.ShortString())
+		t.Equal("TestMonthlyCronUpdated", resp.Trigger.Data.TriggerName)
+		t.Equal("0 20 1 * *", resp.Trigger.Data.Cron)
+	})
+
+	flow.Step("pause trigger in prep for archive", func(ctx context.Context, t flowtest.Asserter) {
+		ctx = authtest.JWTContext(ctx)
+
+		pauseResp, err := uu.TriggerCommand.PauseTrigger(ctx, &trigger_spb.PauseTriggerRequest{
+			TriggerId: TriggerID,
+		})
+		t.NoError(err)
+		t.NotNil(pauseResp)
+		t.Equal("PAUSED", pauseResp.Trigger.Status.ShortString())
+	})
+
+	flow.Step("update trigger while paused", func(ctx context.Context, t flowtest.Asserter) {
+		ctx = authtest.JWTContext(ctx)
+
+		err := uu.UpdateTrigger(ctx, triggerConfig{
+			TriggerID:   TriggerID,
+			AppName:     "testUpdated",
+			TriggerName: "TestMonthlyCronPaused",
+			Cron:        "0 19 1 * *",
+		})
+		t.NoError(err)
+
+		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{
+			TriggerId: TriggerID,
+		})
+
+		t.NoError(err)
+		t.NotNil(resp)
+		t.Equal("PAUSED", resp.Trigger.Status.ShortString())
+		t.Equal("TestMonthlyCronPaused", resp.Trigger.Data.TriggerName)
+		t.Equal("0 19 1 * *", resp.Trigger.Data.Cron)
+	})
+
+	flow.Step("resume paused trigger", func(ctx context.Context, t flowtest.Asserter) {
+		ctx = authtest.JWTContext(ctx)
+
+		pauseResp, err := uu.TriggerCommand.ResumeTrigger(ctx, &trigger_spb.ResumeTriggerRequest{
+			TriggerId: TriggerID,
+		})
+		t.NoError(err)
+		t.NotNil(pauseResp)
+		t.Equal("ACTIVE", pauseResp.Trigger.Status.ShortString())
+	})
+
+	flow.Step("archive paused trigger", func(ctx context.Context, t flowtest.Asserter) {
+		err := uu.ArchiveTrigger(ctx, TriggerID)
+		t.NoError(err)
+
+		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{
+			TriggerId: TriggerID,
+		})
+		t.NoError(err)
+		t.NotNil(resp)
+		t.Equal("ARCHIVED", resp.Trigger.Status.ShortString())
+	})
+}
+
+func TestGrumpyTrigger(tt *testing.T) {
+	flow, uu := NewUniverse(tt)
+	defer flow.RunSteps(tt)
+
+	TriggerID := id62.NewString()
+
+	flow.Step("create trigger", func(ctx context.Context, t flowtest.Asserter) {
+		ctx = authtest.JWTContext(ctx)
+
+		err := uu.CreateTrigger(ctx, triggerConfig{
+			TriggerID:   TriggerID,
+			AppName:     "test",
+			TriggerName: "TestCron",
+			Cron:        "fail",
+		})
+		t.NotNil(err)
+		t.Equal(true, strings.Contains(err.Error(), "invalid cron string: expected exactly 5 fields"))
+
+		err = uu.CreateTrigger(ctx, triggerConfig{
+			TriggerID:   TriggerID,
+			AppName:     "test",
+			TriggerName: "TestCron",
+			Cron:        "0 18 1 * *",
+		})
+		t.NoError(err)
+
+		err = uu.UpdateTrigger(ctx, triggerConfig{
+			TriggerID:   TriggerID,
+			AppName:     "test",
+			TriggerName: "TestCron",
+			Cron:        "99 99 * * *",
+		})
+
+		t.Equal(true, strings.Contains(err.Error(), "invalid cron string: end of range"))
+
+		err = uu.UpdateTrigger(ctx, triggerConfig{
+			TriggerID:   TriggerID,
+			AppName:     "test",
+			TriggerName: "TestCron",
+			Cron:        "0 20 1 * *",
+		})
+		t.NoError(err)
+	})
+}
diff --git a/integration/self_tick_test.go b/integration/self_tick_test.go
index 4e2df9a..69604ad 100644
--- a/integration/self_tick_test.go
+++ b/integration/self_tick_test.go
@@ -82,7 +82,7 @@ func TestSelfTick(tt *testing.T) {
 		uu.Outbox.PopMessage(t, stmsg)
 		t.Equal(true, stmsg.LastTick.AsTime().Equal(lastTick.Add(1*time.Minute)))
 
-		trmsg := &trigger_tpb.TickReplyMessage{}
+		trmsg := &trigger_tpb.TriggerManageReplyMessage{}
 
 		// last tick was sent, so need to add 1 minute to make sure the tick happened at the correct time.
 		thisTick := lastTick.Add(1 * time.Minute)
diff --git a/integration/trigger_test.go b/integration/trigger_test.go
index bf3aeae..690b8df 100644
--- a/integration/trigger_test.go
+++ b/integration/trigger_test.go
@@ -2,278 +2,17 @@ package integration
 
 import (
 	"context"
-	"strings"
 	"testing"
 	"time"
 
 	"github.com/pentops/flowtest"
-	"github.com/pentops/golib/gl"
-	"github.com/pentops/j5/gen/j5/messaging/v1/messaging_j5pb"
 	"github.com/pentops/j5/lib/id62"
 	"github.com/pentops/o5-auth/authtest"
-	"github.com/pentops/trigger/gen/o5/trigger/v1/trigger_pb"
 	"github.com/pentops/trigger/gen/o5/trigger/v1/trigger_spb"
 	"github.com/pentops/trigger/gen/o5/trigger/v1/trigger_tpb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
-func TestTickRequest(tt *testing.T) {
-	flow, uu := NewUniverse(tt)
-	defer flow.RunSteps(tt)
-
-	triggerID := id62.NewString()
-
-	flow.Step("create trigger", func(ctx context.Context, t flowtest.Asserter) {
-		ctx = authtest.JWTContext(ctx)
-
-		req := &trigger_tpb.TickRequestMessage{
-			Request: &messaging_j5pb.RequestMetadata{
-				Context: []byte(""),
-			},
-			Action: &trigger_pb.ActionType{
-				Type: &trigger_pb.ActionType_Create_{
-					Create: &trigger_pb.ActionType_Create{
-						TriggerId:   gl.Ptr(triggerID),
-						AppName:     "test",
-						TriggerName: "TestCron",
-						Cron:        "CRON_TZ=America/New_York 0 7 * * *",
-					},
-				},
-			},
-		}
-
-		_, err := uu.TriggerWorker.TickRequest(ctx, req)
-		t.NoError(err)
-
-		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{TriggerId: triggerID})
-		t.NoError(err)
-		t.NotNil(resp)
-		t.Equal("ACTIVE", resp.Trigger.Status.ShortString())
-		t.Equal("CRON_TZ=America/New_York 0 7 * * *", resp.Trigger.Data.Cron)
-	})
-
-	flow.Step("update trigger", func(ctx context.Context, t flowtest.Asserter) {
-		ctx = authtest.JWTContext(ctx)
-
-		req := &trigger_tpb.TickRequestMessage{
-			Request: &messaging_j5pb.RequestMetadata{
-				Context: []byte(""),
-			},
-			Action: &trigger_pb.ActionType{
-				Type: &trigger_pb.ActionType_Update_{
-					Update: &trigger_pb.ActionType_Update{
-						TriggerId:   triggerID,
-						AppName:     "test",
-						TriggerName: "TestCron",
-						Cron:        "CRON_TZ=America/New_York 0 8 * * *",
-					},
-				},
-			},
-		}
-
-		_, err := uu.TriggerWorker.TickRequest(ctx, req)
-		t.NoError(err)
-
-		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{TriggerId: triggerID})
-		t.NoError(err)
-		t.NotNil(resp)
-		t.Equal("ACTIVE", resp.Trigger.Status.ShortString())
-		t.Equal("CRON_TZ=America/New_York 0 8 * * *", resp.Trigger.Data.Cron)
-	})
-
-	flow.Step("archive trigger", func(ctx context.Context, t flowtest.Asserter) {
-		ctx = authtest.JWTContext(ctx)
-
-		req := &trigger_tpb.TickRequestMessage{
-			Request: &messaging_j5pb.RequestMetadata{
-				Context: []byte(""),
-			},
-			Action: &trigger_pb.ActionType{
-				Type: &trigger_pb.ActionType_Archive_{
-					Archive: &trigger_pb.ActionType_Archive{
-						TriggerId: triggerID,
-					},
-				},
-			},
-		}
-
-		_, err := uu.TriggerWorker.TickRequest(ctx, req)
-		t.NoError(err)
-
-		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{TriggerId: triggerID})
-		t.NoError(err)
-		t.NotNil(resp)
-		t.Equal("ARCHIVED", resp.Trigger.Status.ShortString())
-	})
-}
-
-func TestActive(tt *testing.T) {
-	flow, uu := NewUniverse(tt)
-	defer flow.RunSteps(tt)
-
-	TriggerID := id62.NewString()
-
-	flow.Step("create trigger", func(ctx context.Context, t flowtest.Asserter) {
-		ctx = authtest.JWTContext(ctx)
-
-		err := uu.CreateTrigger(ctx, triggerConfig{
-			TriggerID:   TriggerID,
-			AppName:     "test",
-			TriggerName: "TestMonthlyCron",
-			Cron:        "0 18 1 * *",
-		})
-		t.NoError(err)
-
-		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{
-			TriggerId: TriggerID,
-		})
-		t.NoError(err)
-		t.NotNil(resp)
-		t.Equal("ACTIVE", resp.Trigger.Status.ShortString())
-		t.Equal("TestMonthlyCron", resp.Trigger.Data.TriggerName)
-		t.Equal("0 18 1 * *", resp.Trigger.Data.Cron)
-	})
-
-	flow.Step("update trigger", func(ctx context.Context, t flowtest.Asserter) {
-		ctx = authtest.JWTContext(ctx)
-
-		err := uu.UpdateTrigger(ctx, triggerConfig{
-			TriggerID:   TriggerID,
-			AppName:     "test",
-			TriggerName: "TestMonthlyCron",
-			Cron:        "0 20 * * *",
-		})
-		t.NoError(err)
-
-		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{
-			TriggerId: TriggerID,
-		})
-		t.NoError(err)
-		t.NotNil(resp)
-		t.Equal("ACTIVE", resp.Trigger.Status.ShortString())
-		t.Equal("TestMonthlyCron", resp.Trigger.Data.TriggerName)
-		t.Equal("0 20 * * *", resp.Trigger.Data.Cron)
-	})
-
-	flow.Step("archive trigger", func(ctx context.Context, t flowtest.Asserter) {
-		ctx = authtest.JWTContext(ctx)
-
-		err := uu.ArchiveTrigger(ctx, TriggerID)
-		t.NoError(err)
-
-		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{
-			TriggerId: TriggerID,
-		})
-		t.NoError(err)
-		t.NotNil(resp)
-		t.Equal("ARCHIVED", resp.Trigger.Status.ShortString())
-	})
-}
-
-func TestPause(tt *testing.T) {
-	flow, uu := NewUniverse(tt)
-	defer flow.RunSteps(tt)
-
-	TriggerID := id62.NewString()
-
-	flow.Step("create trigger", func(ctx context.Context, t flowtest.Asserter) {
-		err := uu.CreateTrigger(ctx, triggerConfig{
-			TriggerID:   TriggerID,
-			AppName:     "test",
-			TriggerName: "TestMonthlyCron",
-			Cron:        "0 18 1 * *",
-		})
-		t.NoError(err)
-
-		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{
-			TriggerId: TriggerID,
-		})
-		t.NoError(err)
-		t.NotNil(resp)
-		t.Equal("ACTIVE", resp.Trigger.Status.ShortString())
-		t.Equal("TestMonthlyCron", resp.Trigger.Data.TriggerName)
-		t.Equal("0 18 1 * *", resp.Trigger.Data.Cron)
-	})
-
-	flow.Step("update trigger while active", func(ctx context.Context, t flowtest.Asserter) {
-		ctx = authtest.JWTContext(ctx)
-
-		err := uu.UpdateTrigger(ctx, triggerConfig{
-			TriggerID:   TriggerID,
-			AppName:     "testUpdated",
-			TriggerName: "TestMonthlyCronUpdated",
-			Cron:        "0 20 1 * *",
-		})
-		t.NoError(err)
-
-		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{
-			TriggerId: TriggerID,
-		})
-
-		t.NoError(err)
-		t.NotNil(resp)
-		t.Equal("ACTIVE", resp.Trigger.Status.ShortString())
-		t.Equal("TestMonthlyCronUpdated", resp.Trigger.Data.TriggerName)
-		t.Equal("0 20 1 * *", resp.Trigger.Data.Cron)
-	})
-
-	flow.Step("pause trigger in prep for archive", func(ctx context.Context, t flowtest.Asserter) {
-		ctx = authtest.JWTContext(ctx)
-
-		pauseResp, err := uu.TriggerCommand.PauseTrigger(ctx, &trigger_spb.PauseTriggerRequest{
-			TriggerId: TriggerID,
-		})
-		t.NoError(err)
-		t.NotNil(pauseResp)
-		t.Equal("PAUSED", pauseResp.Trigger.Status.ShortString())
-	})
-
-	flow.Step("update trigger while paused", func(ctx context.Context, t flowtest.Asserter) {
-		ctx = authtest.JWTContext(ctx)
-
-		err := uu.UpdateTrigger(ctx, triggerConfig{
-			TriggerID:   TriggerID,
-			AppName:     "testUpdated",
-			TriggerName: "TestMonthlyCronPaused",
-			Cron:        "0 19 1 * *",
-		})
-		t.NoError(err)
-
-		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{
-			TriggerId: TriggerID,
-		})
-
-		t.NoError(err)
-		t.NotNil(resp)
-		t.Equal("PAUSED", resp.Trigger.Status.ShortString())
-		t.Equal("TestMonthlyCronPaused", resp.Trigger.Data.TriggerName)
-		t.Equal("0 19 1 * *", resp.Trigger.Data.Cron)
-	})
-
-	flow.Step("resume paused trigger", func(ctx context.Context, t flowtest.Asserter) {
-		ctx = authtest.JWTContext(ctx)
-
-		pauseResp, err := uu.TriggerCommand.ResumeTrigger(ctx, &trigger_spb.ResumeTriggerRequest{
-			TriggerId: TriggerID,
-		})
-		t.NoError(err)
-		t.NotNil(pauseResp)
-		t.Equal("ACTIVE", pauseResp.Trigger.Status.ShortString())
-	})
-
-	flow.Step("archive paused trigger", func(ctx context.Context, t flowtest.Asserter) {
-		err := uu.ArchiveTrigger(ctx, TriggerID)
-		t.NoError(err)
-
-		resp, err := uu.Query.TriggerGet(ctx, &trigger_spb.TriggerGetRequest{
-			TriggerId: TriggerID,
-		})
-		t.NoError(err)
-		t.NotNil(resp)
-		t.Equal("ARCHIVED", resp.Trigger.Status.ShortString())
-	})
-}
-
 func TestManualTrigger(tt *testing.T) {
 	flow, uu := NewUniverse(tt)
 	defer flow.RunSteps(tt)
@@ -312,53 +51,8 @@ func TestManualTrigger(tt *testing.T) {
 		t.NotEmpty(resp.Events[0].Event.GetManuallyTriggered()) // Most recent should be a manually triggered event
 		t.Equal(TriggerTime, resp.Events[0].Event.GetManuallyTriggered().TriggerTime)
 
-		trmsg := &trigger_tpb.TickReplyMessage{}
+		trmsg := &trigger_tpb.TriggerManageReplyMessage{}
 		uu.Outbox.PopMessage(t, trmsg)
 		t.Equal(TriggerTime, trmsg.TickTime)
 	})
 }
-
-func TestGrumpyTrigger(tt *testing.T) {
-	flow, uu := NewUniverse(tt)
-	defer flow.RunSteps(tt)
-
-	TriggerID := id62.NewString()
-
-	flow.Step("create trigger", func(ctx context.Context, t flowtest.Asserter) {
-		ctx = authtest.JWTContext(ctx)
-
-		err := uu.CreateTrigger(ctx, triggerConfig{
-			TriggerID:   TriggerID,
-			AppName:     "test",
-			TriggerName: "TestCron",
-			Cron:        "fail",
-		})
-		t.NotNil(err)
-		t.Equal(true, strings.Contains(err.Error(), "invalid cron string: expected exactly 5 fields"))
-
-		err = uu.CreateTrigger(ctx, triggerConfig{
-			TriggerID:   TriggerID,
-			AppName:     "test",
-			TriggerName: "TestCron",
-			Cron:        "0 18 1 * *",
-		})
-		t.NoError(err)
-
-		err = uu.UpdateTrigger(ctx, triggerConfig{
-			TriggerID:   TriggerID,
-			AppName:     "test",
-			TriggerName: "TestCron",
-			Cron:        "99 99 * * *",
-		})
-
-		t.Equal(true, strings.Contains(err.Error(), "invalid cron string: end of range"))
-
-		err = uu.UpdateTrigger(ctx, triggerConfig{
-			TriggerID:   TriggerID,
-			AppName:     "test",
-			TriggerName: "TestCron",
-			Cron:        "0 20 1 * *",
-		})
-		t.NoError(err)
-	})
-}
diff --git a/integration/universe.go b/integration/universe.go
index e916f0d..35f8edf 100644
--- a/integration/universe.go
+++ b/integration/universe.go
@@ -137,7 +137,7 @@ func (uu *Universe) CreateTrigger(ctx context.Context, config triggerConfig) err
 		triggerID = &config.TriggerID
 	}
 
-	req := &trigger_tpb.TickRequestMessage{
+	req := &trigger_tpb.TriggerManageRequestMessage{
 		Request: requestMetadata,
 		Action: &trigger_pb.ActionType{
 			Type: &trigger_pb.ActionType_Create_{
@@ -151,7 +151,7 @@ func (uu *Universe) CreateTrigger(ctx context.Context, config triggerConfig) err
 		},
 	}
 
-	_, err := uu.TriggerWorker.TickRequest(ctx, req)
+	_, err := uu.TriggerWorker.TriggerManageRequest(ctx, req)
 	if err != nil {
 		return fmt.Errorf("failed to universe create trigger: %w", err)
 	}
@@ -188,7 +188,7 @@ func (uu *Universe) UpdateTrigger(ctx context.Context, config triggerConfig) err
 		triggerID = config.TriggerID
 	}
 
-	req := &trigger_tpb.TickRequestMessage{
+	req := &trigger_tpb.TriggerManageRequestMessage{
 		Request: requestMetadata,
 		Action: &trigger_pb.ActionType{
 			Type: &trigger_pb.ActionType_Update_{
@@ -202,7 +202,7 @@ func (uu *Universe) UpdateTrigger(ctx context.Context, config triggerConfig) err
 		},
 	}
 
-	_, err := uu.TriggerWorker.TickRequest(ctx, req)
+	_, err := uu.TriggerWorker.TriggerManageRequest(ctx, req)
 	if err != nil {
 		return fmt.Errorf("failed to universe update trigger: %w", err)
 	}
diff --git a/proto/o5/trigger/v1/topic/trigger.p.j5s.proto b/proto/o5/trigger/v1/topic/trigger.p.j5s.proto
index e27642c..ed41820 100644
--- a/proto/o5/trigger/v1/topic/trigger.p.j5s.proto
+++ b/proto/o5/trigger/v1/topic/trigger.p.j5s.proto
@@ -24,14 +24,14 @@ service TriggerPublishTopic {
   rpc TriggerEvent(TriggerEventMessage) returns (google.protobuf.Empty) {}
 }
 
-service TickRequestTopic {
+service TriggerManageRequestTopic {
   option (j5.messaging.v1.service) = {
     topic_name: "tick"
     request: {
     }
   };
 
-  rpc TickRequest(TickRequestMessage) returns (google.protobuf.Empty) {}
+  rpc TriggerManageRequest(TriggerManageRequestMessage) returns (google.protobuf.Empty) {}
 }
 
 service TickReplyTopic {
@@ -78,7 +78,7 @@ message TriggerEventMessage {
   ];
 }
 
-message TickRequestMessage {
+message TriggerManageRequestMessage {
   option (j5.ext.v1.message).object = {};
 
   j5.messaging.v1.RequestMetadata request = 1 [
diff --git a/proto/o5/trigger/v1/trigger.j5s b/proto/o5/trigger/v1/trigger.j5s
index c7a5428..79c93e4 100644
--- a/proto/o5/trigger/v1/trigger.j5s
+++ b/proto/o5/trigger/v1/trigger.j5s
@@ -144,7 +144,7 @@ entity Trigger {
   }
 }
 
-topic Tick reqres {
+topic TriggerManage reqres {
 	request {
     field action ! oneof:ActionType
 	}
diff --git a/service/service.go b/service/service.go
index be55038..066bc9b 100644
--- a/service/service.go
+++ b/service/service.go
@@ -52,6 +52,6 @@ func (a *Service) RegisterGRPC(server grpc.ServiceRegistrar) {
 	trigger_spb.RegisterTriggerCommandServiceServer(server, a.TriggerCommand)
 	trigger_tpb.RegisterTriggerPublishTopicServer(server, a.TriggerWorker)
 	trigger_tpb.RegisterSelfTickTopicServer(server, a.TriggerWorker)
-	trigger_tpb.RegisterTickRequestTopicServer(server, a.TriggerWorker)
-	trigger_tpb.RegisterTickReplyTopicServer(server, a.TriggerWorker)
+	trigger_tpb.RegisterTriggerManageRequestTopicServer(server, a.TriggerWorker)
+	trigger_tpb.RegisterTriggerManageReplyTopicServer(server, a.TriggerWorker)
 }
diff --git a/service/trigger.go b/service/trigger.go
index 358cb40..0bd51a5 100644
--- a/service/trigger.go
+++ b/service/trigger.go
@@ -29,8 +29,8 @@ type TriggerWorker struct {
 
 	trigger_tpb.UnimplementedTriggerPublishTopicServer
 	trigger_tpb.UnimplementedSelfTickTopicServer
-	trigger_tpb.UnimplementedTickRequestTopicServer
-	trigger_tpb.UnimplementedTickReplyTopicServer
+	trigger_tpb.UnimplementedTriggerManageRequestTopicServer
+	trigger_tpb.UnimplementedTriggerManageReplyTopicServer
 }
 
 const (
@@ -68,7 +68,7 @@ func (w TriggerWorker) InitSelfTick(ctx context.Context) error {
 	return nil
 }
 
-func (w *TriggerWorker) TickRequest(ctx context.Context, req *trigger_tpb.TickRequestMessage) (*emptypb.Empty, error) {
+func (w *TriggerWorker) TriggerManageRequest(ctx context.Context, req *trigger_tpb.TriggerManageRequestMessage) (*emptypb.Empty, error) {
 	var evt *trigger_pb.TriggerPSMEventSpec
 
 	switch req.Action.Type.(type) {
diff --git a/states/states.go b/states/states.go
index ffd3262..461b2b3 100644
--- a/states/states.go
+++ b/states/states.go
@@ -67,7 +67,7 @@ func NewTriggerStateMachine() (*trigger_pb.TriggerPSM, error) {
 			event *trigger_pb.TriggerEventType_Triggered,
 		) error {
 
-			reply := &trigger_tpb.TickReplyMessage{
+			reply := &trigger_tpb.TriggerManageReplyMessage{
 				Request:  state.Data.RequestMetadata,
 				TickTime: event.TriggerTime,
 			}
@@ -87,7 +87,7 @@ func NewTriggerStateMachine() (*trigger_pb.TriggerPSM, error) {
 			event *trigger_pb.TriggerEventType_ManuallyTriggered,
 		) error {
 
-			reply := &trigger_tpb.TickReplyMessage{
+			reply := &trigger_tpb.TriggerManageReplyMessage{
 				Request:  state.Data.RequestMetadata,
 				TickTime: event.TriggerTime,
 			}

From 171d7e5e12bf518a3c4b4ec223e612f6ac9ec7f7 Mon Sep 17 00:00:00 2001
From: Brent Johnson <brentj433@gmail.com>
Date: Wed, 13 Aug 2025 14:45:18 -0700
Subject: [PATCH 2/2] create trigger reqres to send trigger events over

---
 .../v1/trigger_tpb/trigger.p.j5s.pb.go        | 298 ++++++++++++++----
 .../v1/trigger_tpb/trigger.p.j5s_grpc.pb.go   | 180 +++++++++++
 .../v1/trigger_tpb/trigger.p.j5s_j5.pb.go     |  22 ++
 .../trigger.p.j5s_o5_messaging.pb.go          | 192 +++++++++++
 integration/self_tick_test.go                 |   2 +-
 integration/trigger_test.go                   |   2 +-
 .../o5/trigger/v1/service/trigger.p.j5s.proto |  35 +-
 proto/o5/trigger/v1/topic/trigger.p.j5s.proto |  56 +++-
 proto/o5/trigger/v1/trigger.j5s               |  14 +-
 proto/o5/trigger/v1/trigger.j5s.proto         |  17 +-
 states/states.go                              |   4 +-
 11 files changed, 709 insertions(+), 113 deletions(-)

diff --git a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s.pb.go b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s.pb.go
index d545515..b38b513 100644
--- a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s.pb.go
+++ b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s.pb.go
@@ -217,6 +217,109 @@ func (x *TriggerManageReplyMessage) GetTickTime() *timestamppb.Timestamp {
 	return nil
 }
 
+type TriggerRequestMessage struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Request *messaging_j5pb.RequestMetadata `protobuf:"bytes,1,opt,name=request,proto3" json:"request,omitempty"`
+}
+
+func (x *TriggerRequestMessage) Reset() {
+	*x = TriggerRequestMessage{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_o5_trigger_v1_topic_trigger_p_j5s_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TriggerRequestMessage) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TriggerRequestMessage) ProtoMessage() {}
+
+func (x *TriggerRequestMessage) ProtoReflect() protoreflect.Message {
+	mi := &file_o5_trigger_v1_topic_trigger_p_j5s_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 mi.MessageOf(x)
+}
+
+// Deprecated: Use TriggerRequestMessage.ProtoReflect.Descriptor instead.
+func (*TriggerRequestMessage) Descriptor() ([]byte, []int) {
+	return file_o5_trigger_v1_topic_trigger_p_j5s_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *TriggerRequestMessage) GetRequest() *messaging_j5pb.RequestMetadata {
+	if x != nil {
+		return x.Request
+	}
+	return nil
+}
+
+type TriggerReplyMessage struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Request *messaging_j5pb.RequestMetadata `protobuf:"bytes,1,opt,name=request,proto3" json:"request,omitempty"`
+	// The time the trigger is for
+	TickTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=tick_time,json=tickTime,proto3" json:"tick_time,omitempty"`
+}
+
+func (x *TriggerReplyMessage) Reset() {
+	*x = TriggerReplyMessage{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_o5_trigger_v1_topic_trigger_p_j5s_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TriggerReplyMessage) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TriggerReplyMessage) ProtoMessage() {}
+
+func (x *TriggerReplyMessage) ProtoReflect() protoreflect.Message {
+	mi := &file_o5_trigger_v1_topic_trigger_p_j5s_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TriggerReplyMessage.ProtoReflect.Descriptor instead.
+func (*TriggerReplyMessage) Descriptor() ([]byte, []int) {
+	return file_o5_trigger_v1_topic_trigger_p_j5s_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *TriggerReplyMessage) GetRequest() *messaging_j5pb.RequestMetadata {
+	if x != nil {
+		return x.Request
+	}
+	return nil
+}
+
+func (x *TriggerReplyMessage) GetTickTime() *timestamppb.Timestamp {
+	if x != nil {
+		return x.TickTime
+	}
+	return nil
+}
+
 var File_o5_trigger_v1_topic_trigger_p_j5s_proto protoreflect.FileDescriptor
 
 var file_o5_trigger_v1_topic_trigger_p_j5s_proto_rawDesc = []byte{
@@ -286,39 +389,73 @@ var file_o5_trigger_v1_topic_trigger_p_j5s_proto_rawDesc = []byte{
 	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42,
 	0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xaa, 0x02, 0x00, 0x52,
 	0x08, 0x74, 0x69, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02,
-	0x52, 0x00, 0x32, 0x99, 0x01, 0x0a, 0x13, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x50, 0x75,
-	0x62, 0x6c, 0x69, 0x73, 0x68, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x50, 0x0a, 0x0c, 0x54, 0x72,
-	0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x6f, 0x35, 0x2e,
-	0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x74, 0x6f, 0x70, 0x69, 0x63,
-	0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x30, 0xda, 0xa2,
-	0xf5, 0xe4, 0x02, 0x2a, 0x0a, 0x0f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x70, 0x75,
-	0x62, 0x6c, 0x69, 0x73, 0x68, 0x6a, 0x17, 0x0a, 0x15, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67,
-	0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x32, 0x97,
-	0x01, 0x0a, 0x19, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x60, 0x0a, 0x14,
-	0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x30, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65,
-	0x72, 0x2e, 0x76, 0x31, 0x2e, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67,
-	0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d,
+	0x52, 0x00, 0x22, 0x6b, 0x0a, 0x15, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x49, 0x0a, 0x07, 0x72,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6a,
+	0x35, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x0d,
+	0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x07, 0x72,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22,
+	0xb2, 0x01, 0x0a, 0x13, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79,
+	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x49, 0x0a, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6a, 0x35, 0x2e, 0x6d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x0d, 0xba, 0x48, 0x03, 0xc8,
+	0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x52, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x47, 0x0a, 0x09, 0x74, 0x69, 0x63, 0x6b, 0x5f, 0x74, 0x69, 0x6d, 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, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xaa, 0x02,
+	0x00, 0x52, 0x08, 0x74, 0x69, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x3a, 0x07, 0xc2, 0xff, 0x8e,
+	0x02, 0x02, 0x52, 0x00, 0x32, 0x99, 0x01, 0x0a, 0x13, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
+	0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x50, 0x0a, 0x0c,
+	0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x6f,
+	0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x74, 0x6f, 0x70,
+	0x69, 0x63, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x4d,
 	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x18,
-	0xda, 0xa2, 0xf5, 0xe4, 0x02, 0x12, 0x0a, 0x0e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f,
-	0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x5a, 0x00, 0x32, 0x91, 0x01, 0x0a, 0x17, 0x54, 0x72, 0x69,
-	0x67, 0x67, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x54,
-	0x6f, 0x70, 0x69, 0x63, 0x12, 0x5c, 0x0a, 0x12, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4d,
-	0x61, 0x6e, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x2e, 0x2e, 0x6f, 0x35, 0x2e,
-	0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x74, 0x6f, 0x70, 0x69, 0x63,
-	0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x52, 0x65,
-	0x70, 0x6c, 0x79, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70,
-	0x74, 0x79, 0x1a, 0x18, 0xda, 0xa2, 0xf5, 0xe4, 0x02, 0x12, 0x0a, 0x0e, 0x74, 0x72, 0x69, 0x67,
-	0x67, 0x65, 0x72, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x62, 0x00, 0x42, 0x3a, 0x5a, 0x38,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x65, 0x6e, 0x74, 0x6f,
-	0x70, 0x73, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x6f,
-	0x35, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x69,
-	0x67, 0x67, 0x65, 0x72, 0x5f, 0x74, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x30,
+	0xda, 0xa2, 0xf5, 0xe4, 0x02, 0x2a, 0x0a, 0x0f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f,
+	0x70, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x6a, 0x17, 0x0a, 0x15, 0x6f, 0x35, 0x2e, 0x74, 0x72,
+	0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
+	0x32, 0x97, 0x01, 0x0a, 0x19, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61,
+	0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x60,
+	0x0a, 0x14, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x30, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67,
+	0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x2e, 0x54, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79,
+	0x1a, 0x18, 0xda, 0xa2, 0xf5, 0xe4, 0x02, 0x12, 0x0a, 0x0e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65,
+	0x72, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x5a, 0x00, 0x32, 0x91, 0x01, 0x0a, 0x17, 0x54,
+	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c,
+	0x79, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x5c, 0x0a, 0x12, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65,
+	0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x2e, 0x2e, 0x6f,
+	0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x74, 0x6f, 0x70,
+	0x69, 0x63, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65,
+	0x52, 0x65, 0x70, 0x6c, 0x79, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x16, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45,
+	0x6d, 0x70, 0x74, 0x79, 0x1a, 0x18, 0xda, 0xa2, 0xf5, 0xe4, 0x02, 0x12, 0x0a, 0x0e, 0x74, 0x72,
+	0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x62, 0x00, 0x32, 0x7e,
+	0x0a, 0x13, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x54, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x54, 0x0a, 0x0e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2a, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x2e, 0x54, 0x72,
+	0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73,
+	0x61, 0x67, 0x65, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x11, 0xda, 0xa2, 0xf5,
+	0xe4, 0x02, 0x0b, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5a, 0x00, 0x32, 0x78,
+	0x0a, 0x11, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x54, 0x6f,
+	0x70, 0x69, 0x63, 0x12, 0x50, 0x0a, 0x0c, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65,
+	0x70, 0x6c, 0x79, 0x12, 0x28, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
+	0x2e, 0x76, 0x31, 0x2e, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65,
+	0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x16, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x11, 0xda, 0xa2, 0xf5, 0xe4, 0x02, 0x0b, 0x0a, 0x07, 0x74,
+	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x62, 0x00, 0x42, 0x3a, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x65, 0x6e, 0x74, 0x6f, 0x70, 0x73, 0x2f, 0x74,
+	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x6f, 0x35, 0x2f, 0x74, 0x72,
+	0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
+	0x5f, 0x74, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -333,42 +470,51 @@ func file_o5_trigger_v1_topic_trigger_p_j5s_proto_rawDescGZIP() []byte {
 	return file_o5_trigger_v1_topic_trigger_p_j5s_proto_rawDescData
 }
 
-var file_o5_trigger_v1_topic_trigger_p_j5s_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_o5_trigger_v1_topic_trigger_p_j5s_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
 var file_o5_trigger_v1_topic_trigger_p_j5s_proto_goTypes = []interface{}{
 	(*TriggerEventMessage)(nil),            // 0: o5.trigger.v1.topic.TriggerEventMessage
 	(*TriggerManageRequestMessage)(nil),    // 1: o5.trigger.v1.topic.TriggerManageRequestMessage
 	(*TriggerManageReplyMessage)(nil),      // 2: o5.trigger.v1.topic.TriggerManageReplyMessage
-	(*psm_j5pb.EventPublishMetadata)(nil),  // 3: j5.state.v1.EventPublishMetadata
-	(*trigger_pb.TriggerKeys)(nil),         // 4: o5.trigger.v1.TriggerKeys
-	(*trigger_pb.TriggerEventType)(nil),    // 5: o5.trigger.v1.TriggerEventType
-	(*trigger_pb.TriggerData)(nil),         // 6: o5.trigger.v1.TriggerData
-	(trigger_pb.TriggerStatus)(0),          // 7: o5.trigger.v1.TriggerStatus
-	(*messaging_j5pb.RequestMetadata)(nil), // 8: j5.messaging.v1.RequestMetadata
-	(*trigger_pb.ActionType)(nil),          // 9: o5.trigger.v1.ActionType
-	(*timestamppb.Timestamp)(nil),          // 10: google.protobuf.Timestamp
-	(*emptypb.Empty)(nil),                  // 11: google.protobuf.Empty
+	(*TriggerRequestMessage)(nil),          // 3: o5.trigger.v1.topic.TriggerRequestMessage
+	(*TriggerReplyMessage)(nil),            // 4: o5.trigger.v1.topic.TriggerReplyMessage
+	(*psm_j5pb.EventPublishMetadata)(nil),  // 5: j5.state.v1.EventPublishMetadata
+	(*trigger_pb.TriggerKeys)(nil),         // 6: o5.trigger.v1.TriggerKeys
+	(*trigger_pb.TriggerEventType)(nil),    // 7: o5.trigger.v1.TriggerEventType
+	(*trigger_pb.TriggerData)(nil),         // 8: o5.trigger.v1.TriggerData
+	(trigger_pb.TriggerStatus)(0),          // 9: o5.trigger.v1.TriggerStatus
+	(*messaging_j5pb.RequestMetadata)(nil), // 10: j5.messaging.v1.RequestMetadata
+	(*trigger_pb.ActionType)(nil),          // 11: o5.trigger.v1.ActionType
+	(*timestamppb.Timestamp)(nil),          // 12: google.protobuf.Timestamp
+	(*emptypb.Empty)(nil),                  // 13: google.protobuf.Empty
 }
 var file_o5_trigger_v1_topic_trigger_p_j5s_proto_depIdxs = []int32{
-	3,  // 0: o5.trigger.v1.topic.TriggerEventMessage.metadata:type_name -> j5.state.v1.EventPublishMetadata
-	4,  // 1: o5.trigger.v1.topic.TriggerEventMessage.keys:type_name -> o5.trigger.v1.TriggerKeys
-	5,  // 2: o5.trigger.v1.topic.TriggerEventMessage.event:type_name -> o5.trigger.v1.TriggerEventType
-	6,  // 3: o5.trigger.v1.topic.TriggerEventMessage.data:type_name -> o5.trigger.v1.TriggerData
-	7,  // 4: o5.trigger.v1.topic.TriggerEventMessage.status:type_name -> o5.trigger.v1.TriggerStatus
-	8,  // 5: o5.trigger.v1.topic.TriggerManageRequestMessage.request:type_name -> j5.messaging.v1.RequestMetadata
-	9,  // 6: o5.trigger.v1.topic.TriggerManageRequestMessage.action:type_name -> o5.trigger.v1.ActionType
-	8,  // 7: o5.trigger.v1.topic.TriggerManageReplyMessage.request:type_name -> j5.messaging.v1.RequestMetadata
-	10, // 8: o5.trigger.v1.topic.TriggerManageReplyMessage.tick_time:type_name -> google.protobuf.Timestamp
-	0,  // 9: o5.trigger.v1.topic.TriggerPublishTopic.TriggerEvent:input_type -> o5.trigger.v1.topic.TriggerEventMessage
-	1,  // 10: o5.trigger.v1.topic.TriggerManageRequestTopic.TriggerManageRequest:input_type -> o5.trigger.v1.topic.TriggerManageRequestMessage
-	2,  // 11: o5.trigger.v1.topic.TriggerManageReplyTopic.TriggerManageReply:input_type -> o5.trigger.v1.topic.TriggerManageReplyMessage
-	11, // 12: o5.trigger.v1.topic.TriggerPublishTopic.TriggerEvent:output_type -> google.protobuf.Empty
-	11, // 13: o5.trigger.v1.topic.TriggerManageRequestTopic.TriggerManageRequest:output_type -> google.protobuf.Empty
-	11, // 14: o5.trigger.v1.topic.TriggerManageReplyTopic.TriggerManageReply:output_type -> google.protobuf.Empty
-	12, // [12:15] is the sub-list for method output_type
-	9,  // [9:12] is the sub-list for method input_type
-	9,  // [9:9] is the sub-list for extension type_name
-	9,  // [9:9] is the sub-list for extension extendee
-	0,  // [0:9] is the sub-list for field type_name
+	5,  // 0: o5.trigger.v1.topic.TriggerEventMessage.metadata:type_name -> j5.state.v1.EventPublishMetadata
+	6,  // 1: o5.trigger.v1.topic.TriggerEventMessage.keys:type_name -> o5.trigger.v1.TriggerKeys
+	7,  // 2: o5.trigger.v1.topic.TriggerEventMessage.event:type_name -> o5.trigger.v1.TriggerEventType
+	8,  // 3: o5.trigger.v1.topic.TriggerEventMessage.data:type_name -> o5.trigger.v1.TriggerData
+	9,  // 4: o5.trigger.v1.topic.TriggerEventMessage.status:type_name -> o5.trigger.v1.TriggerStatus
+	10, // 5: o5.trigger.v1.topic.TriggerManageRequestMessage.request:type_name -> j5.messaging.v1.RequestMetadata
+	11, // 6: o5.trigger.v1.topic.TriggerManageRequestMessage.action:type_name -> o5.trigger.v1.ActionType
+	10, // 7: o5.trigger.v1.topic.TriggerManageReplyMessage.request:type_name -> j5.messaging.v1.RequestMetadata
+	12, // 8: o5.trigger.v1.topic.TriggerManageReplyMessage.tick_time:type_name -> google.protobuf.Timestamp
+	10, // 9: o5.trigger.v1.topic.TriggerRequestMessage.request:type_name -> j5.messaging.v1.RequestMetadata
+	10, // 10: o5.trigger.v1.topic.TriggerReplyMessage.request:type_name -> j5.messaging.v1.RequestMetadata
+	12, // 11: o5.trigger.v1.topic.TriggerReplyMessage.tick_time:type_name -> google.protobuf.Timestamp
+	0,  // 12: o5.trigger.v1.topic.TriggerPublishTopic.TriggerEvent:input_type -> o5.trigger.v1.topic.TriggerEventMessage
+	1,  // 13: o5.trigger.v1.topic.TriggerManageRequestTopic.TriggerManageRequest:input_type -> o5.trigger.v1.topic.TriggerManageRequestMessage
+	2,  // 14: o5.trigger.v1.topic.TriggerManageReplyTopic.TriggerManageReply:input_type -> o5.trigger.v1.topic.TriggerManageReplyMessage
+	3,  // 15: o5.trigger.v1.topic.TriggerRequestTopic.TriggerRequest:input_type -> o5.trigger.v1.topic.TriggerRequestMessage
+	4,  // 16: o5.trigger.v1.topic.TriggerReplyTopic.TriggerReply:input_type -> o5.trigger.v1.topic.TriggerReplyMessage
+	13, // 17: o5.trigger.v1.topic.TriggerPublishTopic.TriggerEvent:output_type -> google.protobuf.Empty
+	13, // 18: o5.trigger.v1.topic.TriggerManageRequestTopic.TriggerManageRequest:output_type -> google.protobuf.Empty
+	13, // 19: o5.trigger.v1.topic.TriggerManageReplyTopic.TriggerManageReply:output_type -> google.protobuf.Empty
+	13, // 20: o5.trigger.v1.topic.TriggerRequestTopic.TriggerRequest:output_type -> google.protobuf.Empty
+	13, // 21: o5.trigger.v1.topic.TriggerReplyTopic.TriggerReply:output_type -> google.protobuf.Empty
+	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
 }
 
 func init() { file_o5_trigger_v1_topic_trigger_p_j5s_proto_init() }
@@ -413,6 +559,30 @@ func file_o5_trigger_v1_topic_trigger_p_j5s_proto_init() {
 				return nil
 			}
 		}
+		file_o5_trigger_v1_topic_trigger_p_j5s_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TriggerRequestMessage); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_o5_trigger_v1_topic_trigger_p_j5s_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TriggerReplyMessage); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -420,9 +590,9 @@ func file_o5_trigger_v1_topic_trigger_p_j5s_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_o5_trigger_v1_topic_trigger_p_j5s_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   3,
+			NumMessages:   5,
 			NumExtensions: 0,
-			NumServices:   3,
+			NumServices:   5,
 		},
 		GoTypes:           file_o5_trigger_v1_topic_trigger_p_j5s_proto_goTypes,
 		DependencyIndexes: file_o5_trigger_v1_topic_trigger_p_j5s_proto_depIdxs,
diff --git a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_grpc.pb.go b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_grpc.pb.go
index dadefff..3acc3ca 100644
--- a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_grpc.pb.go
+++ b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_grpc.pb.go
@@ -290,3 +290,183 @@ var TriggerManageReplyTopic_ServiceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "o5/trigger/v1/topic/trigger.p.j5s.proto",
 }
+
+const (
+	TriggerRequestTopic_TriggerRequest_FullMethodName = "/o5.trigger.v1.topic.TriggerRequestTopic/TriggerRequest"
+)
+
+// TriggerRequestTopicClient is the client API for TriggerRequestTopic service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
+type TriggerRequestTopicClient interface {
+	TriggerRequest(ctx context.Context, in *TriggerRequestMessage, opts ...grpc.CallOption) (*emptypb.Empty, error)
+}
+
+type triggerRequestTopicClient struct {
+	cc grpc.ClientConnInterface
+}
+
+func NewTriggerRequestTopicClient(cc grpc.ClientConnInterface) TriggerRequestTopicClient {
+	return &triggerRequestTopicClient{cc}
+}
+
+func (c *triggerRequestTopicClient) TriggerRequest(ctx context.Context, in *TriggerRequestMessage, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
+	err := c.cc.Invoke(ctx, TriggerRequestTopic_TriggerRequest_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// TriggerRequestTopicServer is the server API for TriggerRequestTopic service.
+// All implementations must embed UnimplementedTriggerRequestTopicServer
+// for forward compatibility
+type TriggerRequestTopicServer interface {
+	TriggerRequest(context.Context, *TriggerRequestMessage) (*emptypb.Empty, error)
+	mustEmbedUnimplementedTriggerRequestTopicServer()
+}
+
+// UnimplementedTriggerRequestTopicServer must be embedded to have forward compatible implementations.
+type UnimplementedTriggerRequestTopicServer struct {
+}
+
+func (UnimplementedTriggerRequestTopicServer) TriggerRequest(context.Context, *TriggerRequestMessage) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method TriggerRequest not implemented")
+}
+func (UnimplementedTriggerRequestTopicServer) mustEmbedUnimplementedTriggerRequestTopicServer() {}
+
+// UnsafeTriggerRequestTopicServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to TriggerRequestTopicServer will
+// result in compilation errors.
+type UnsafeTriggerRequestTopicServer interface {
+	mustEmbedUnimplementedTriggerRequestTopicServer()
+}
+
+func RegisterTriggerRequestTopicServer(s grpc.ServiceRegistrar, srv TriggerRequestTopicServer) {
+	s.RegisterService(&TriggerRequestTopic_ServiceDesc, srv)
+}
+
+func _TriggerRequestTopic_TriggerRequest_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(TriggerRequestMessage)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(TriggerRequestTopicServer).TriggerRequest(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: TriggerRequestTopic_TriggerRequest_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(TriggerRequestTopicServer).TriggerRequest(ctx, req.(*TriggerRequestMessage))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+// TriggerRequestTopic_ServiceDesc is the grpc.ServiceDesc for TriggerRequestTopic service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var TriggerRequestTopic_ServiceDesc = grpc.ServiceDesc{
+	ServiceName: "o5.trigger.v1.topic.TriggerRequestTopic",
+	HandlerType: (*TriggerRequestTopicServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "TriggerRequest",
+			Handler:    _TriggerRequestTopic_TriggerRequest_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "o5/trigger/v1/topic/trigger.p.j5s.proto",
+}
+
+const (
+	TriggerReplyTopic_TriggerReply_FullMethodName = "/o5.trigger.v1.topic.TriggerReplyTopic/TriggerReply"
+)
+
+// TriggerReplyTopicClient is the client API for TriggerReplyTopic service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
+type TriggerReplyTopicClient interface {
+	TriggerReply(ctx context.Context, in *TriggerReplyMessage, opts ...grpc.CallOption) (*emptypb.Empty, error)
+}
+
+type triggerReplyTopicClient struct {
+	cc grpc.ClientConnInterface
+}
+
+func NewTriggerReplyTopicClient(cc grpc.ClientConnInterface) TriggerReplyTopicClient {
+	return &triggerReplyTopicClient{cc}
+}
+
+func (c *triggerReplyTopicClient) TriggerReply(ctx context.Context, in *TriggerReplyMessage, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
+	err := c.cc.Invoke(ctx, TriggerReplyTopic_TriggerReply_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// TriggerReplyTopicServer is the server API for TriggerReplyTopic service.
+// All implementations must embed UnimplementedTriggerReplyTopicServer
+// for forward compatibility
+type TriggerReplyTopicServer interface {
+	TriggerReply(context.Context, *TriggerReplyMessage) (*emptypb.Empty, error)
+	mustEmbedUnimplementedTriggerReplyTopicServer()
+}
+
+// UnimplementedTriggerReplyTopicServer must be embedded to have forward compatible implementations.
+type UnimplementedTriggerReplyTopicServer struct {
+}
+
+func (UnimplementedTriggerReplyTopicServer) TriggerReply(context.Context, *TriggerReplyMessage) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method TriggerReply not implemented")
+}
+func (UnimplementedTriggerReplyTopicServer) mustEmbedUnimplementedTriggerReplyTopicServer() {}
+
+// UnsafeTriggerReplyTopicServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to TriggerReplyTopicServer will
+// result in compilation errors.
+type UnsafeTriggerReplyTopicServer interface {
+	mustEmbedUnimplementedTriggerReplyTopicServer()
+}
+
+func RegisterTriggerReplyTopicServer(s grpc.ServiceRegistrar, srv TriggerReplyTopicServer) {
+	s.RegisterService(&TriggerReplyTopic_ServiceDesc, srv)
+}
+
+func _TriggerReplyTopic_TriggerReply_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(TriggerReplyMessage)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(TriggerReplyTopicServer).TriggerReply(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: TriggerReplyTopic_TriggerReply_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(TriggerReplyTopicServer).TriggerReply(ctx, req.(*TriggerReplyMessage))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+// TriggerReplyTopic_ServiceDesc is the grpc.ServiceDesc for TriggerReplyTopic service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var TriggerReplyTopic_ServiceDesc = grpc.ServiceDesc{
+	ServiceName: "o5.trigger.v1.topic.TriggerReplyTopic",
+	HandlerType: (*TriggerReplyTopicServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "TriggerReply",
+			Handler:    _TriggerReplyTopic_TriggerReply_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "o5/trigger/v1/topic/trigger.p.j5s.proto",
+}
diff --git a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_j5.pb.go b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_j5.pb.go
index f392daf..8a66dde 100644
--- a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_j5.pb.go
+++ b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_j5.pb.go
@@ -39,3 +39,25 @@ func (msg *TriggerManageReplyMessage) J5Reflect() j5reflect.Root {
 func (msg *TriggerManageReplyMessage) J5Object() j5reflect.Object {
 	return j5reflect.MustReflect(msg.ProtoReflect()).(j5reflect.Object)
 }
+
+func (msg *TriggerRequestMessage) Clone() any {
+	return proto.Clone(msg).(*TriggerRequestMessage)
+}
+func (msg *TriggerRequestMessage) J5Reflect() j5reflect.Root {
+	return j5reflect.MustReflect(msg.ProtoReflect())
+}
+
+func (msg *TriggerRequestMessage) J5Object() j5reflect.Object {
+	return j5reflect.MustReflect(msg.ProtoReflect()).(j5reflect.Object)
+}
+
+func (msg *TriggerReplyMessage) Clone() any {
+	return proto.Clone(msg).(*TriggerReplyMessage)
+}
+func (msg *TriggerReplyMessage) J5Reflect() j5reflect.Root {
+	return j5reflect.MustReflect(msg.ProtoReflect())
+}
+
+func (msg *TriggerReplyMessage) J5Object() j5reflect.Object {
+	return j5reflect.MustReflect(msg.ProtoReflect()).(j5reflect.Object)
+}
diff --git a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_o5_messaging.pb.go b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_o5_messaging.pb.go
index ebad42b..81cc17a 100644
--- a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_o5_messaging.pb.go
+++ b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_o5_messaging.pb.go
@@ -286,3 +286,195 @@ func (collect TriggerManageReplyTopicCollector[C]) TriggerManageReply(sendContex
 func (publish TriggerManageReplyTopicPublisher) TriggerManageReply(ctx context.Context, msg *TriggerManageReplyMessage) error {
 	return publish.publisher.Publish(ctx, msg)
 }
+
+// Service: TriggerRequestTopic
+// Expose Request Metadata
+func (msg *TriggerRequestMessage) SetJ5RequestMetadata(md *messaging_j5pb.RequestMetadata) {
+	msg.Request = md
+}
+func (msg *TriggerRequestMessage) GetJ5RequestMetadata() *messaging_j5pb.RequestMetadata {
+	return msg.Request
+}
+
+// Method: TriggerRequest
+
+func (msg *TriggerRequestMessage) O5MessageHeader() o5msg.Header {
+	header := o5msg.Header{
+		GrpcService:      "o5.trigger.v1.topic.TriggerRequestTopic",
+		GrpcMethod:       "TriggerRequest",
+		Headers:          map[string]string{},
+		DestinationTopic: "trigger",
+	}
+	if msg.Request != nil {
+		header.Extension = &messaging_pb.Message_Request_{
+			Request: &messaging_pb.Message_Request{
+				ReplyTo: msg.Request.ReplyTo,
+			},
+		}
+	} else {
+		header.Extension = &messaging_pb.Message_Request_{
+			Request: &messaging_pb.Message_Request{
+				ReplyTo: "",
+			},
+		}
+	}
+	return header
+}
+
+type TriggerRequestTopicTxSender[C any] struct {
+	sender o5msg.TxSender[C]
+}
+
+func NewTriggerRequestTopicTxSender[C any](sender o5msg.TxSender[C]) *TriggerRequestTopicTxSender[C] {
+	sender.Register(o5msg.TopicDescriptor{
+		Service: "o5.trigger.v1.topic.TriggerRequestTopic",
+		Methods: []o5msg.MethodDescriptor{
+			{
+				Name:    "TriggerRequest",
+				Message: (*TriggerRequestMessage).ProtoReflect(nil).Descriptor(),
+			},
+		},
+	})
+	return &TriggerRequestTopicTxSender[C]{sender: sender}
+}
+
+type TriggerRequestTopicCollector[C any] struct {
+	collector o5msg.Collector[C]
+}
+
+func NewTriggerRequestTopicCollector[C any](collector o5msg.Collector[C]) *TriggerRequestTopicCollector[C] {
+	collector.Register(o5msg.TopicDescriptor{
+		Service: "o5.trigger.v1.topic.TriggerRequestTopic",
+		Methods: []o5msg.MethodDescriptor{
+			{
+				Name:    "TriggerRequest",
+				Message: (*TriggerRequestMessage).ProtoReflect(nil).Descriptor(),
+			},
+		},
+	})
+	return &TriggerRequestTopicCollector[C]{collector: collector}
+}
+
+type TriggerRequestTopicPublisher struct {
+	publisher o5msg.Publisher
+}
+
+func NewTriggerRequestTopicPublisher(publisher o5msg.Publisher) *TriggerRequestTopicPublisher {
+	publisher.Register(o5msg.TopicDescriptor{
+		Service: "o5.trigger.v1.topic.TriggerRequestTopic",
+		Methods: []o5msg.MethodDescriptor{
+			{
+				Name:    "TriggerRequest",
+				Message: (*TriggerRequestMessage).ProtoReflect(nil).Descriptor(),
+			},
+		},
+	})
+	return &TriggerRequestTopicPublisher{publisher: publisher}
+}
+
+// Method: TriggerRequest
+
+func (send TriggerRequestTopicTxSender[C]) TriggerRequest(ctx context.Context, sendContext C, msg *TriggerRequestMessage) error {
+	return send.sender.Send(ctx, sendContext, msg)
+}
+
+func (collect TriggerRequestTopicCollector[C]) TriggerRequest(sendContext C, msg *TriggerRequestMessage) {
+	collect.collector.Collect(sendContext, msg)
+}
+
+func (publish TriggerRequestTopicPublisher) TriggerRequest(ctx context.Context, msg *TriggerRequestMessage) error {
+	return publish.publisher.Publish(ctx, msg)
+}
+
+// Service: TriggerReplyTopic
+// Expose Request Metadata
+func (msg *TriggerReplyMessage) SetJ5RequestMetadata(md *messaging_j5pb.RequestMetadata) {
+	msg.Request = md
+}
+func (msg *TriggerReplyMessage) GetJ5RequestMetadata() *messaging_j5pb.RequestMetadata {
+	return msg.Request
+}
+
+// Method: TriggerReply
+
+func (msg *TriggerReplyMessage) O5MessageHeader() o5msg.Header {
+	header := o5msg.Header{
+		GrpcService:      "o5.trigger.v1.topic.TriggerReplyTopic",
+		GrpcMethod:       "TriggerReply",
+		Headers:          map[string]string{},
+		DestinationTopic: "trigger",
+	}
+	if msg.Request != nil {
+		header.Extension = &messaging_pb.Message_Reply_{
+			Reply: &messaging_pb.Message_Reply{
+				ReplyTo: msg.Request.ReplyTo,
+			},
+		}
+	}
+	return header
+}
+
+type TriggerReplyTopicTxSender[C any] struct {
+	sender o5msg.TxSender[C]
+}
+
+func NewTriggerReplyTopicTxSender[C any](sender o5msg.TxSender[C]) *TriggerReplyTopicTxSender[C] {
+	sender.Register(o5msg.TopicDescriptor{
+		Service: "o5.trigger.v1.topic.TriggerReplyTopic",
+		Methods: []o5msg.MethodDescriptor{
+			{
+				Name:    "TriggerReply",
+				Message: (*TriggerReplyMessage).ProtoReflect(nil).Descriptor(),
+			},
+		},
+	})
+	return &TriggerReplyTopicTxSender[C]{sender: sender}
+}
+
+type TriggerReplyTopicCollector[C any] struct {
+	collector o5msg.Collector[C]
+}
+
+func NewTriggerReplyTopicCollector[C any](collector o5msg.Collector[C]) *TriggerReplyTopicCollector[C] {
+	collector.Register(o5msg.TopicDescriptor{
+		Service: "o5.trigger.v1.topic.TriggerReplyTopic",
+		Methods: []o5msg.MethodDescriptor{
+			{
+				Name:    "TriggerReply",
+				Message: (*TriggerReplyMessage).ProtoReflect(nil).Descriptor(),
+			},
+		},
+	})
+	return &TriggerReplyTopicCollector[C]{collector: collector}
+}
+
+type TriggerReplyTopicPublisher struct {
+	publisher o5msg.Publisher
+}
+
+func NewTriggerReplyTopicPublisher(publisher o5msg.Publisher) *TriggerReplyTopicPublisher {
+	publisher.Register(o5msg.TopicDescriptor{
+		Service: "o5.trigger.v1.topic.TriggerReplyTopic",
+		Methods: []o5msg.MethodDescriptor{
+			{
+				Name:    "TriggerReply",
+				Message: (*TriggerReplyMessage).ProtoReflect(nil).Descriptor(),
+			},
+		},
+	})
+	return &TriggerReplyTopicPublisher{publisher: publisher}
+}
+
+// Method: TriggerReply
+
+func (send TriggerReplyTopicTxSender[C]) TriggerReply(ctx context.Context, sendContext C, msg *TriggerReplyMessage) error {
+	return send.sender.Send(ctx, sendContext, msg)
+}
+
+func (collect TriggerReplyTopicCollector[C]) TriggerReply(sendContext C, msg *TriggerReplyMessage) {
+	collect.collector.Collect(sendContext, msg)
+}
+
+func (publish TriggerReplyTopicPublisher) TriggerReply(ctx context.Context, msg *TriggerReplyMessage) error {
+	return publish.publisher.Publish(ctx, msg)
+}
diff --git a/integration/self_tick_test.go b/integration/self_tick_test.go
index 69604ad..a9d675b 100644
--- a/integration/self_tick_test.go
+++ b/integration/self_tick_test.go
@@ -82,7 +82,7 @@ func TestSelfTick(tt *testing.T) {
 		uu.Outbox.PopMessage(t, stmsg)
 		t.Equal(true, stmsg.LastTick.AsTime().Equal(lastTick.Add(1*time.Minute)))
 
-		trmsg := &trigger_tpb.TriggerManageReplyMessage{}
+		trmsg := &trigger_tpb.TriggerReplyMessage{}
 
 		// last tick was sent, so need to add 1 minute to make sure the tick happened at the correct time.
 		thisTick := lastTick.Add(1 * time.Minute)
diff --git a/integration/trigger_test.go b/integration/trigger_test.go
index 690b8df..13a87a7 100644
--- a/integration/trigger_test.go
+++ b/integration/trigger_test.go
@@ -51,7 +51,7 @@ func TestManualTrigger(tt *testing.T) {
 		t.NotEmpty(resp.Events[0].Event.GetManuallyTriggered()) // Most recent should be a manually triggered event
 		t.Equal(TriggerTime, resp.Events[0].Event.GetManuallyTriggered().TriggerTime)
 
-		trmsg := &trigger_tpb.TriggerManageReplyMessage{}
+		trmsg := &trigger_tpb.TriggerReplyMessage{}
 		uu.Outbox.PopMessage(t, trmsg)
 		t.Equal(TriggerTime, trmsg.TickTime)
 	})
diff --git a/proto/o5/trigger/v1/service/trigger.p.j5s.proto b/proto/o5/trigger/v1/service/trigger.p.j5s.proto
index c3b8dcf..dc4a140 100644
--- a/proto/o5/trigger/v1/service/trigger.p.j5s.proto
+++ b/proto/o5/trigger/v1/service/trigger.p.j5s.proto
@@ -1,4 +1,4 @@
-// Generated by j5build v0.0.0-20250514220842-c918124a4d17. DO NOT EDIT
+// Generated by j5build v0.0.0-20250801192111-61f853c07a23. DO NOT EDIT
 
 syntax = "proto3";
 
@@ -60,14 +60,9 @@ message TriggerGetRequest {
   option (j5.ext.v1.message).object = {};
 
   string trigger_id = 1 [
-    (buf.validate.field) = {
-      required: true
-      string: {
-        pattern: "^[0-9A-Za-z]{22}$"
-      }
-    },
-    (j5.ext.v1.field).key = {},
-    (j5.ext.v1.key).primary_key = true
+    (buf.validate.field).string.pattern = "^[0-9A-Za-z]{22}$",
+    (j5.ext.v1.field).key.format = FORMAT_ID62,
+    (j5.ext.v1.key).primary = true
   ];
 }
 
@@ -91,10 +86,7 @@ message TriggerListRequest {
 message TriggerListResponse {
   option (j5.ext.v1.message).object = {};
 
-  repeated o5.trigger.v1.TriggerState trigger = 1 [
-    (buf.validate.field).required = true,
-    (j5.ext.v1.field).array = {}
-  ];
+  repeated o5.trigger.v1.TriggerState trigger = 1 [(j5.ext.v1.field).array = {}];
 
   j5.list.v1.PageResponse page = 2 [(j5.ext.v1.field).object = {}];
 }
@@ -103,14 +95,9 @@ message TriggerEventsRequest {
   option (j5.ext.v1.message).object = {};
 
   string trigger_id = 1 [
-    (buf.validate.field) = {
-      required: true
-      string: {
-        pattern: "^[0-9A-Za-z]{22}$"
-      }
-    },
-    (j5.ext.v1.field).key = {},
-    (j5.ext.v1.key).primary_key = true
+    (buf.validate.field).string.pattern = "^[0-9A-Za-z]{22}$",
+    (j5.ext.v1.field).key.format = FORMAT_ID62,
+    (j5.ext.v1.key).primary = true
   ];
 
   j5.list.v1.PageRequest page = 2 [(j5.ext.v1.field).object = {}];
@@ -136,7 +123,7 @@ message PauseTriggerRequest {
         pattern: "^[0-9A-Za-z]{22}$"
       }
     },
-    (j5.ext.v1.field).key = {}
+    (j5.ext.v1.field).key.format = FORMAT_ID62
   ];
 }
 
@@ -159,7 +146,7 @@ message ResumeTriggerRequest {
         pattern: "^[0-9A-Za-z]{22}$"
       }
     },
-    (j5.ext.v1.field).key = {}
+    (j5.ext.v1.field).key.format = FORMAT_ID62
   ];
 }
 
@@ -182,7 +169,7 @@ message ManuallyTriggerRequest {
         pattern: "^[0-9A-Za-z]{22}$"
       }
     },
-    (j5.ext.v1.field).key = {}
+    (j5.ext.v1.field).key.format = FORMAT_ID62
   ];
 
   // The time the trigger is for
diff --git a/proto/o5/trigger/v1/topic/trigger.p.j5s.proto b/proto/o5/trigger/v1/topic/trigger.p.j5s.proto
index ed41820..4fb8fee 100644
--- a/proto/o5/trigger/v1/topic/trigger.p.j5s.proto
+++ b/proto/o5/trigger/v1/topic/trigger.p.j5s.proto
@@ -1,4 +1,4 @@
-// Generated by j5build v0.0.0-20250514220842-c918124a4d17. DO NOT EDIT
+// Generated by j5build v0.0.0-20250801192111-61f853c07a23. DO NOT EDIT
 
 syntax = "proto3";
 
@@ -26,7 +26,7 @@ service TriggerPublishTopic {
 
 service TriggerManageRequestTopic {
   option (j5.messaging.v1.service) = {
-    topic_name: "tick"
+    topic_name: "trigger_manage"
     request: {
     }
   };
@@ -34,14 +34,34 @@ service TriggerManageRequestTopic {
   rpc TriggerManageRequest(TriggerManageRequestMessage) returns (google.protobuf.Empty) {}
 }
 
-service TickReplyTopic {
+service TriggerManageReplyTopic {
   option (j5.messaging.v1.service) = {
-    topic_name: "tick"
+    topic_name: "trigger_manage"
     reply: {
     }
   };
 
-  rpc TickReply(TickReplyMessage) returns (google.protobuf.Empty) {}
+  rpc TriggerManageReply(TriggerManageReplyMessage) returns (google.protobuf.Empty) {}
+}
+
+service TriggerRequestTopic {
+  option (j5.messaging.v1.service) = {
+    topic_name: "trigger"
+    request: {
+    }
+  };
+
+  rpc TriggerRequest(TriggerRequestMessage) returns (google.protobuf.Empty) {}
+}
+
+service TriggerReplyTopic {
+  option (j5.messaging.v1.service) = {
+    topic_name: "trigger"
+    reply: {
+    }
+  };
+
+  rpc TriggerReply(TriggerReplyMessage) returns (google.protobuf.Empty) {}
 }
 
 message TriggerEventMessage {
@@ -92,7 +112,31 @@ message TriggerManageRequestMessage {
   ];
 }
 
-message TickReplyMessage {
+message TriggerManageReplyMessage {
+  option (j5.ext.v1.message).object = {};
+
+  j5.messaging.v1.RequestMetadata request = 1 [
+    (buf.validate.field).required = true,
+    (j5.ext.v1.field).object = {}
+  ];
+
+  // The time the trigger is for
+  google.protobuf.Timestamp tick_time = 2 [
+    (buf.validate.field).required = true,
+    (j5.ext.v1.field).timestamp = {}
+  ];
+}
+
+message TriggerRequestMessage {
+  option (j5.ext.v1.message).object = {};
+
+  j5.messaging.v1.RequestMetadata request = 1 [
+    (buf.validate.field).required = true,
+    (j5.ext.v1.field).object = {}
+  ];
+}
+
+message TriggerReplyMessage {
   option (j5.ext.v1.message).object = {};
 
   j5.messaging.v1.RequestMetadata request = 1 [
diff --git a/proto/o5/trigger/v1/trigger.j5s b/proto/o5/trigger/v1/trigger.j5s
index 79c93e4..bc85923 100644
--- a/proto/o5/trigger/v1/trigger.j5s
+++ b/proto/o5/trigger/v1/trigger.j5s
@@ -61,10 +61,7 @@ entity Trigger {
   event ManuallyTriggered {
     | Manually run the trigger for a specific time
 
-    field triggerTime timestamp {
-      | The time the trigger is for
-      required = true
-    }
+    field triggerTime ! timestamp | The time the trigger is for
   }
 
   event Triggered {
@@ -179,3 +176,12 @@ oneof ActionType {
     field triggerID ! string
   }
 }
+
+topic Trigger reqres {
+	request {
+	}
+
+	reply {
+    field tickTime ! timestamp | The time the trigger is for
+	}
+}
diff --git a/proto/o5/trigger/v1/trigger.j5s.proto b/proto/o5/trigger/v1/trigger.j5s.proto
index 0973955..9207065 100644
--- a/proto/o5/trigger/v1/trigger.j5s.proto
+++ b/proto/o5/trigger/v1/trigger.j5s.proto
@@ -1,4 +1,4 @@
-// Generated by j5build v0.0.0-20250514220842-c918124a4d17. DO NOT EDIT
+// Generated by j5build v0.0.0-20250801192111-61f853c07a23. DO NOT EDIT
 
 syntax = "proto3";
 
@@ -20,14 +20,9 @@ message TriggerKeys {
   option (j5.ext.v1.message).object = {};
 
   string trigger_id = 1 [
-    (buf.validate.field) = {
-      required: true
-      string: {
-        pattern: "^[0-9A-Za-z]{22}$"
-      }
-    },
-    (j5.ext.v1.field).key = {},
-    (j5.ext.v1.key).primary_key = true
+    (buf.validate.field).string.pattern = "^[0-9A-Za-z]{22}$",
+    (j5.ext.v1.field).key.format = FORMAT_ID62,
+    (j5.ext.v1.key).primary = true
   ];
 }
 
@@ -237,7 +232,7 @@ message ActionType {
 
     optional string trigger_id = 1 [
       (buf.validate.field).string.pattern = "^[0-9A-Za-z]{22}$",
-      (j5.ext.v1.field).key = {}
+      (j5.ext.v1.field).key.format = FORMAT_ID62
     ];
 
     string trigger_name = 2 [
@@ -263,7 +258,7 @@ message ActionType {
           pattern: "^[0-9A-Za-z]{22}$"
         }
       },
-      (j5.ext.v1.field).key = {}
+      (j5.ext.v1.field).key.format = FORMAT_ID62
     ];
 
     string trigger_name = 2 [
diff --git a/states/states.go b/states/states.go
index 461b2b3..2ee3c23 100644
--- a/states/states.go
+++ b/states/states.go
@@ -67,7 +67,7 @@ func NewTriggerStateMachine() (*trigger_pb.TriggerPSM, error) {
 			event *trigger_pb.TriggerEventType_Triggered,
 		) error {
 
-			reply := &trigger_tpb.TriggerManageReplyMessage{
+			reply := &trigger_tpb.TriggerReplyMessage{
 				Request:  state.Data.RequestMetadata,
 				TickTime: event.TriggerTime,
 			}
@@ -87,7 +87,7 @@ func NewTriggerStateMachine() (*trigger_pb.TriggerPSM, error) {
 			event *trigger_pb.TriggerEventType_ManuallyTriggered,
 		) error {
 
-			reply := &trigger_tpb.TriggerManageReplyMessage{
+			reply := &trigger_tpb.TriggerReplyMessage{
 				Request:  state.Data.RequestMetadata,
 				TickTime: event.TriggerTime,
 			}