diff --git a/examples/example.js b/examples/example.js
index 7726a4d..b213d0e 100644
--- a/examples/example.js
+++ b/examples/example.js
@@ -6,7 +6,7 @@ const { Wallet } = ethers;
 const { UlidMonotonic } = require("id128");
 const util = require("util");
 
-const { TaskType, TriggerType } = require("./static_codegen/avs_pb");
+const { TaskType, TaskTrigger } = require("./static_codegen/avs_pb");
 
 // Load the protobuf definition
 const packageDefinition = protoLoader.loadSync("../protobuf/avs.proto", {
@@ -394,7 +394,7 @@ async function scheduleERC20TransferJob(owner, token, taskCondition) {
   metadata.add("authkey", token);
 
   let trigger = {
-    trigger_type: TriggerType.BLOCKTRIGGER,
+    trigger_type: TaskTrigger.TriggerTypeCase.BLOCK,
     block: {
       interval: 5, // run every 5 block
     },
@@ -402,9 +402,9 @@ async function scheduleERC20TransferJob(owner, token, taskCondition) {
 
   if (process.argv[2] == "schedule-cron") {
     trigger = {
-      trigger_type: TriggerType.TIMETRIGGER,
+      trigger_type: TaskTrigger.TriggerTypeCase.CRON,
       cron: {
-        cron_table: [
+        schedule: [
           // every 5 hours
           "0 */5 * * *",
         ],
@@ -412,16 +412,16 @@ async function scheduleERC20TransferJob(owner, token, taskCondition) {
     };
   } else if (process.argv[2] == "schedule-event") {
     trigger = {
-      trigger_type: TriggerType.EVENTTRIGGER,
+      trigger_type: TaskTrigger.TriggerTypeCase.EVENT,
       event: {
         expression: taskCondition,
       },
     };
   } else if (process.argv[2] == "schedule-fixed") {
     trigger = {
-      trigger_type: TriggerType.FIXEDEPOCHTRIGGER,
-      at: {
-        epoches: [
+      trigger_type: TaskTrigger.TriggerTypeCase.AT,
+      fixed_time: {
+        epochs: [
           Math.floor(new Date().getTime() / 1000 + 3600),
           Math.floor(new Date().getTime() / 1000 + 7200),
         ],
@@ -429,7 +429,7 @@ async function scheduleERC20TransferJob(owner, token, taskCondition) {
     };
   } else if (process.argv[2] == "schedule-manual") {
     trigger = {
-      trigger_type: TriggerType.MANUALTRIGGER,
+      trigger_type: TriggerType.MANUAL,
       manual: true,
     };
   }
@@ -498,55 +498,6 @@ async function scheduleERC20TransferJob(owner, token, taskCondition) {
   return result;
 }
 
-async function scheduleTimeTransfer(owner, token) {
-  // Now we can schedule a task
-  // 1. Generate the calldata to check condition
-  const taskBody = getTaskData();
-  console.log("Task body:", taskBody);
-  console.log("\nTask condition: Timeschedule", "*/2");
-
-  const metadata = new grpc.Metadata();
-  metadata.add("authkey", token);
-
-  console.log("Trigger type", TriggerType.TIMETRIGGER);
-
-  const result = await asyncRPC(
-    client,
-    "CreateTask",
-    {
-      // A contract execution will be perform for this taks
-      task_type: TaskType.CONTRACTEXECUTIONTASK,
-
-      actions: [{
-        contract_execution: {
-          // Our ERC20 test token deploy on sepolia
-          // https://sepolia.etherscan.io/token/0x69256ca54e6296e460dec7b29b7dcd97b81a3d55#code
-          contract_address: config[env].TEST_TRANSFER_TOKEN,
-          call_data: taskBody,
-        },
-      }],
-      trigger: {
-        //trigger_type: TriggerType.TIMETRIGGER,
-        //schedule: {
-        //  cron: "*/2 * * * *",
-        //},
-
-        trigger_type: TriggerType.EVENTTRIGGER,
-        event: {
-          expression: `topic0 == "123" && topic2 == "334"`,
-        },
-      },
-
-      start_at: Math.floor(Date.now() / 1000) + 30,
-      expired_at: Math.floor(Date.now() / 1000 + 3600 * 24 * 30),
-      memo: `Demo Example task for ${owner}`,
-    },
-    metadata
-  );
-
-  console.log("Expression Task ID is:", result);
-}
-
 (async () => {
   try {
     main(process.argv[2]);
diff --git a/examples/static_codegen/avs_grpc_pb.js b/examples/static_codegen/avs_grpc_pb.js
index ed3ab4b..25d3e95 100644
--- a/examples/static_codegen/avs_grpc_pb.js
+++ b/examples/static_codegen/avs_grpc_pb.js
@@ -6,28 +6,6 @@ var avs_pb = require('./avs_pb.js');
 var google_protobuf_timestamp_pb = require('google-protobuf/google/protobuf/timestamp_pb.js');
 var google_protobuf_wrappers_pb = require('google-protobuf/google/protobuf/wrappers_pb.js');
 
-function serialize_aggregator_AddressRequest(arg) {
-  if (!(arg instanceof avs_pb.AddressRequest)) {
-    throw new Error('Expected argument of type aggregator.AddressRequest');
-  }
-  return Buffer.from(arg.serializeBinary());
-}
-
-function deserialize_aggregator_AddressRequest(buffer_arg) {
-  return avs_pb.AddressRequest.deserializeBinary(new Uint8Array(buffer_arg));
-}
-
-function serialize_aggregator_AddressResp(arg) {
-  if (!(arg instanceof avs_pb.AddressResp)) {
-    throw new Error('Expected argument of type aggregator.AddressResp');
-  }
-  return Buffer.from(arg.serializeBinary());
-}
-
-function deserialize_aggregator_AddressResp(buffer_arg) {
-  return avs_pb.AddressResp.deserializeBinary(new Uint8Array(buffer_arg));
-}
-
 function serialize_aggregator_Checkin(arg) {
   if (!(arg instanceof avs_pb.Checkin)) {
     throw new Error('Expected argument of type aggregator.Checkin');
@@ -105,6 +83,17 @@ function deserialize_aggregator_GetKeyReq(buffer_arg) {
   return avs_pb.GetKeyReq.deserializeBinary(new Uint8Array(buffer_arg));
 }
 
+function serialize_aggregator_IdReq(arg) {
+  if (!(arg instanceof avs_pb.IdReq)) {
+    throw new Error('Expected argument of type aggregator.IdReq');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_aggregator_IdReq(buffer_arg) {
+  return avs_pb.IdReq.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
 function serialize_aggregator_KeyResp(arg) {
   if (!(arg instanceof avs_pb.KeyResp)) {
     throw new Error('Expected argument of type aggregator.KeyResp');
@@ -138,6 +127,28 @@ function deserialize_aggregator_ListTasksResp(buffer_arg) {
   return avs_pb.ListTasksResp.deserializeBinary(new Uint8Array(buffer_arg));
 }
 
+function serialize_aggregator_ListWalletReq(arg) {
+  if (!(arg instanceof avs_pb.ListWalletReq)) {
+    throw new Error('Expected argument of type aggregator.ListWalletReq');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_aggregator_ListWalletReq(buffer_arg) {
+  return avs_pb.ListWalletReq.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
+function serialize_aggregator_ListWalletResp(arg) {
+  if (!(arg instanceof avs_pb.ListWalletResp)) {
+    throw new Error('Expected argument of type aggregator.ListWalletResp');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_aggregator_ListWalletResp(buffer_arg) {
+  return avs_pb.ListWalletResp.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
 function serialize_aggregator_NonceRequest(arg) {
   if (!(arg instanceof avs_pb.NonceRequest)) {
     throw new Error('Expected argument of type aggregator.NonceRequest');
@@ -193,17 +204,6 @@ function deserialize_aggregator_Task(buffer_arg) {
   return avs_pb.Task.deserializeBinary(new Uint8Array(buffer_arg));
 }
 
-function serialize_aggregator_UUID(arg) {
-  if (!(arg instanceof avs_pb.UUID)) {
-    throw new Error('Expected argument of type aggregator.UUID');
-  }
-  return Buffer.from(arg.serializeBinary());
-}
-
-function deserialize_aggregator_UUID(buffer_arg) {
-  return avs_pb.UUID.deserializeBinary(new Uint8Array(buffer_arg));
-}
-
 function serialize_aggregator_UpdateChecksReq(arg) {
   if (!(arg instanceof avs_pb.UpdateChecksReq)) {
     throw new Error('Expected argument of type aggregator.UpdateChecksReq');
@@ -263,19 +263,7 @@ getNonce: {
     responseSerialize: serialize_aggregator_NonceResp,
     responseDeserialize: deserialize_aggregator_NonceResp,
   },
-  getSmartAccountAddress: {
-    path: '/aggregator.Aggregator/GetSmartAccountAddress',
-    requestStream: false,
-    responseStream: false,
-    requestType: avs_pb.AddressRequest,
-    responseType: avs_pb.AddressResp,
-    requestSerialize: serialize_aggregator_AddressRequest,
-    requestDeserialize: deserialize_aggregator_AddressRequest,
-    responseSerialize: serialize_aggregator_AddressResp,
-    responseDeserialize: deserialize_aggregator_AddressResp,
-  },
-  // Task Management
-createWallet: {
+  createWallet: {
     path: '/aggregator.Aggregator/CreateWallet',
     requestStream: false,
     responseStream: false,
@@ -286,7 +274,19 @@ createWallet: {
     responseSerialize: serialize_aggregator_CreateWalletResp,
     responseDeserialize: deserialize_aggregator_CreateWalletResp,
   },
-  createTask: {
+  listWallets: {
+    path: '/aggregator.Aggregator/ListWallets',
+    requestStream: false,
+    responseStream: false,
+    requestType: avs_pb.ListWalletReq,
+    responseType: avs_pb.ListWalletResp,
+    requestSerialize: serialize_aggregator_ListWalletReq,
+    requestDeserialize: deserialize_aggregator_ListWalletReq,
+    responseSerialize: serialize_aggregator_ListWalletResp,
+    responseDeserialize: deserialize_aggregator_ListWalletResp,
+  },
+  // Task Management
+createTask: {
     path: '/aggregator.Aggregator/CreateTask',
     requestStream: false,
     responseStream: false,
@@ -312,10 +312,10 @@ createWallet: {
     path: '/aggregator.Aggregator/GetTask',
     requestStream: false,
     responseStream: false,
-    requestType: avs_pb.UUID,
+    requestType: avs_pb.IdReq,
     responseType: avs_pb.Task,
-    requestSerialize: serialize_aggregator_UUID,
-    requestDeserialize: deserialize_aggregator_UUID,
+    requestSerialize: serialize_aggregator_IdReq,
+    requestDeserialize: deserialize_aggregator_IdReq,
     responseSerialize: serialize_aggregator_Task,
     responseDeserialize: deserialize_aggregator_Task,
   },
@@ -323,10 +323,10 @@ createWallet: {
     path: '/aggregator.Aggregator/CancelTask',
     requestStream: false,
     responseStream: false,
-    requestType: avs_pb.UUID,
+    requestType: avs_pb.IdReq,
     responseType: google_protobuf_wrappers_pb.BoolValue,
-    requestSerialize: serialize_aggregator_UUID,
-    requestDeserialize: deserialize_aggregator_UUID,
+    requestSerialize: serialize_aggregator_IdReq,
+    requestDeserialize: deserialize_aggregator_IdReq,
     responseSerialize: serialize_google_protobuf_BoolValue,
     responseDeserialize: deserialize_google_protobuf_BoolValue,
   },
@@ -334,10 +334,10 @@ createWallet: {
     path: '/aggregator.Aggregator/DeleteTask',
     requestStream: false,
     responseStream: false,
-    requestType: avs_pb.UUID,
+    requestType: avs_pb.IdReq,
     responseType: google_protobuf_wrappers_pb.BoolValue,
-    requestSerialize: serialize_aggregator_UUID,
-    requestDeserialize: deserialize_aggregator_UUID,
+    requestSerialize: serialize_aggregator_IdReq,
+    requestDeserialize: deserialize_aggregator_IdReq,
     responseSerialize: serialize_google_protobuf_BoolValue,
     responseDeserialize: deserialize_google_protobuf_BoolValue,
   },
diff --git a/examples/static_codegen/avs_pb.js b/examples/static_codegen/avs_pb.js
index d3115be..57ec579 100644
--- a/examples/static_codegen/avs_pb.js
+++ b/examples/static_codegen/avs_pb.js
@@ -25,15 +25,13 @@ var google_protobuf_timestamp_pb = require('google-protobuf/google/protobuf/time
 goog.object.extend(proto, google_protobuf_timestamp_pb);
 var google_protobuf_wrappers_pb = require('google-protobuf/google/protobuf/wrappers_pb.js');
 goog.object.extend(proto, google_protobuf_wrappers_pb);
-goog.exportSymbol('proto.aggregator.AddressRequest', null, global);
-goog.exportSymbol('proto.aggregator.AddressResp', null, global);
 goog.exportSymbol('proto.aggregator.BlockCondition', null, global);
 goog.exportSymbol('proto.aggregator.BranchNode', null, global);
 goog.exportSymbol('proto.aggregator.Checkin', null, global);
 goog.exportSymbol('proto.aggregator.Checkin.Status', null, global);
 goog.exportSymbol('proto.aggregator.CheckinResp', null, global);
-goog.exportSymbol('proto.aggregator.ConditionJump', null, global);
-goog.exportSymbol('proto.aggregator.ContractQueryNode', null, global);
+goog.exportSymbol('proto.aggregator.Condition', null, global);
+goog.exportSymbol('proto.aggregator.ContractReadNode', null, global);
 goog.exportSymbol('proto.aggregator.ContractWriteNode', null, global);
 goog.exportSymbol('proto.aggregator.CreateTaskReq', null, global);
 goog.exportSymbol('proto.aggregator.CreateTaskResp', null, global);
@@ -50,9 +48,13 @@ goog.exportSymbol('proto.aggregator.FilterNode', null, global);
 goog.exportSymbol('proto.aggregator.FixedEpochCondition', null, global);
 goog.exportSymbol('proto.aggregator.GetKeyReq', null, global);
 goog.exportSymbol('proto.aggregator.GraphQLQueryNode', null, global);
+goog.exportSymbol('proto.aggregator.IdReq', null, global);
 goog.exportSymbol('proto.aggregator.KeyResp', null, global);
 goog.exportSymbol('proto.aggregator.ListTasksReq', null, global);
 goog.exportSymbol('proto.aggregator.ListTasksResp', null, global);
+goog.exportSymbol('proto.aggregator.ListWalletReq', null, global);
+goog.exportSymbol('proto.aggregator.ListWalletResp', null, global);
+goog.exportSymbol('proto.aggregator.LoopNode', null, global);
 goog.exportSymbol('proto.aggregator.NonceRequest', null, global);
 goog.exportSymbol('proto.aggregator.NonceResp', null, global);
 goog.exportSymbol('proto.aggregator.RestAPINode', null, global);
@@ -62,13 +64,10 @@ goog.exportSymbol('proto.aggregator.SyncTasksResp', null, global);
 goog.exportSymbol('proto.aggregator.Task', null, global);
 goog.exportSymbol('proto.aggregator.TaskEdge', null, global);
 goog.exportSymbol('proto.aggregator.TaskNode', null, global);
-goog.exportSymbol('proto.aggregator.TaskNode.TaskBodyCase', null, global);
+goog.exportSymbol('proto.aggregator.TaskNode.TaskTypeCase', null, global);
 goog.exportSymbol('proto.aggregator.TaskStatus', null, global);
 goog.exportSymbol('proto.aggregator.TaskTrigger', null, global);
-goog.exportSymbol('proto.aggregator.TaskTrigger.TriggerConditionCase', null, global);
-goog.exportSymbol('proto.aggregator.TaskType', null, global);
-goog.exportSymbol('proto.aggregator.TriggerType', null, global);
-goog.exportSymbol('proto.aggregator.UUID', null, global);
+goog.exportSymbol('proto.aggregator.TaskTrigger.TriggerTypeCase', null, global);
 goog.exportSymbol('proto.aggregator.UpdateChecksReq', null, global);
 goog.exportSymbol('proto.aggregator.UpdateChecksResp', null, global);
 /**
@@ -81,16 +80,16 @@ goog.exportSymbol('proto.aggregator.UpdateChecksResp', null, global);
  * @extends {jspb.Message}
  * @constructor
  */
-proto.aggregator.UUID = function(opt_data) {
+proto.aggregator.IdReq = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.aggregator.UUID, jspb.Message);
+goog.inherits(proto.aggregator.IdReq, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.aggregator.UUID.displayName = 'proto.aggregator.UUID';
+  proto.aggregator.IdReq.displayName = 'proto.aggregator.IdReq';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -354,16 +353,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.aggregator.ContractQueryNode = function(opt_data) {
+proto.aggregator.ContractReadNode = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.aggregator.ContractQueryNode, jspb.Message);
+goog.inherits(proto.aggregator.ContractReadNode, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.aggregator.ContractQueryNode.displayName = 'proto.aggregator.ContractQueryNode';
+  proto.aggregator.ContractReadNode.displayName = 'proto.aggregator.ContractReadNode';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -438,16 +437,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.aggregator.ConditionJump = function(opt_data) {
+proto.aggregator.Condition = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.aggregator.ConditionJump, jspb.Message);
+goog.inherits(proto.aggregator.Condition, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.aggregator.ConditionJump.displayName = 'proto.aggregator.ConditionJump';
+  proto.aggregator.Condition.displayName = 'proto.aggregator.Condition';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -491,6 +490,27 @@ if (goog.DEBUG && !COMPILED) {
    */
   proto.aggregator.FilterNode.displayName = 'proto.aggregator.FilterNode';
 }
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.aggregator.LoopNode = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.aggregator.LoopNode, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.aggregator.LoopNode.displayName = 'proto.aggregator.LoopNode';
+}
 /**
  * Generated by JsPbCodeGenerator.
  * @param {Array=} opt_data Optional initial data array, typically from a
@@ -669,16 +689,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.aggregator.AddressRequest = function(opt_data) {
+proto.aggregator.ListWalletReq = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.aggregator.AddressRequest, jspb.Message);
+goog.inherits(proto.aggregator.ListWalletReq, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.aggregator.AddressRequest.displayName = 'proto.aggregator.AddressRequest';
+  proto.aggregator.ListWalletReq.displayName = 'proto.aggregator.ListWalletReq';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -711,16 +731,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.aggregator.AddressResp = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.aggregator.AddressResp.repeatedFields_, null);
+proto.aggregator.ListWalletResp = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, proto.aggregator.ListWalletResp.repeatedFields_, null);
 };
-goog.inherits(proto.aggregator.AddressResp, jspb.Message);
+goog.inherits(proto.aggregator.ListWalletResp, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.aggregator.AddressResp.displayName = 'proto.aggregator.AddressResp';
+  proto.aggregator.ListWalletResp.displayName = 'proto.aggregator.ListWalletResp';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -906,8 +926,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.aggregator.UUID.prototype.toObject = function(opt_includeInstance) {
-  return proto.aggregator.UUID.toObject(opt_includeInstance, this);
+proto.aggregator.IdReq.prototype.toObject = function(opt_includeInstance) {
+  return proto.aggregator.IdReq.toObject(opt_includeInstance, this);
 };
 
 
@@ -916,13 +936,13 @@ proto.aggregator.UUID.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.aggregator.UUID} msg The msg instance to transform.
+ * @param {!proto.aggregator.IdReq} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.aggregator.UUID.toObject = function(includeInstance, msg) {
+proto.aggregator.IdReq.toObject = function(includeInstance, msg) {
   var f, obj = {
-    bytes: jspb.Message.getFieldWithDefault(msg, 1, "")
+    id: jspb.Message.getFieldWithDefault(msg, 1, "")
   };
 
   if (includeInstance) {
@@ -936,23 +956,23 @@ proto.aggregator.UUID.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.aggregator.UUID}
+ * @return {!proto.aggregator.IdReq}
  */
-proto.aggregator.UUID.deserializeBinary = function(bytes) {
+proto.aggregator.IdReq.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.aggregator.UUID;
-  return proto.aggregator.UUID.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.aggregator.IdReq;
+  return proto.aggregator.IdReq.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.aggregator.UUID} msg The message object to deserialize into.
+ * @param {!proto.aggregator.IdReq} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.aggregator.UUID}
+ * @return {!proto.aggregator.IdReq}
  */
-proto.aggregator.UUID.deserializeBinaryFromReader = function(msg, reader) {
+proto.aggregator.IdReq.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -961,7 +981,7 @@ proto.aggregator.UUID.deserializeBinaryFromReader = function(msg, reader) {
     switch (field) {
     case 1:
       var value = /** @type {string} */ (reader.readString());
-      msg.setBytes(value);
+      msg.setId(value);
       break;
     default:
       reader.skipField();
@@ -976,9 +996,9 @@ proto.aggregator.UUID.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.aggregator.UUID.prototype.serializeBinary = function() {
+proto.aggregator.IdReq.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.aggregator.UUID.serializeBinaryToWriter(this, writer);
+  proto.aggregator.IdReq.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -986,13 +1006,13 @@ proto.aggregator.UUID.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.aggregator.UUID} message
+ * @param {!proto.aggregator.IdReq} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.aggregator.UUID.serializeBinaryToWriter = function(message, writer) {
+proto.aggregator.IdReq.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getBytes();
+  f = message.getId();
   if (f.length > 0) {
     writer.writeString(
       1,
@@ -1003,19 +1023,19 @@ proto.aggregator.UUID.serializeBinaryToWriter = function(message, writer) {
 
 
 /**
- * optional string bytes = 1;
+ * optional string id = 1;
  * @return {string}
  */
-proto.aggregator.UUID.prototype.getBytes = function() {
+proto.aggregator.IdReq.prototype.getId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.aggregator.UUID} returns this
+ * @return {!proto.aggregator.IdReq} returns this
  */
-proto.aggregator.UUID.prototype.setBytes = function(value) {
+proto.aggregator.IdReq.prototype.setId = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 
@@ -1972,7 +1992,7 @@ proto.aggregator.FixedEpochCondition.prototype.toObject = function(opt_includeIn
  */
 proto.aggregator.FixedEpochCondition.toObject = function(includeInstance, msg) {
   var f, obj = {
-    epochesList: (f = jspb.Message.getRepeatedField(msg, 1)) == null ? undefined : f
+    epochsList: (f = jspb.Message.getRepeatedField(msg, 1)) == null ? undefined : f
   };
 
   if (includeInstance) {
@@ -2012,7 +2032,7 @@ proto.aggregator.FixedEpochCondition.deserializeBinaryFromReader = function(msg,
     case 1:
       var values = /** @type {!Array<number>} */ (reader.isDelimited() ? reader.readPackedInt64() : [reader.readInt64()]);
       for (var i = 0; i < values.length; i++) {
-        msg.addEpoches(values[i]);
+        msg.addEpochs(values[i]);
       }
       break;
     default:
@@ -2044,7 +2064,7 @@ proto.aggregator.FixedEpochCondition.prototype.serializeBinary = function() {
  */
 proto.aggregator.FixedEpochCondition.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getEpochesList();
+  f = message.getEpochsList();
   if (f.length > 0) {
     writer.writePackedInt64(
       1,
@@ -2055,10 +2075,10 @@ proto.aggregator.FixedEpochCondition.serializeBinaryToWriter = function(message,
 
 
 /**
- * repeated int64 epoches = 1;
+ * repeated int64 epochs = 1;
  * @return {!Array<number>}
  */
-proto.aggregator.FixedEpochCondition.prototype.getEpochesList = function() {
+proto.aggregator.FixedEpochCondition.prototype.getEpochsList = function() {
   return /** @type {!Array<number>} */ (jspb.Message.getRepeatedField(this, 1));
 };
 
@@ -2067,7 +2087,7 @@ proto.aggregator.FixedEpochCondition.prototype.getEpochesList = function() {
  * @param {!Array<number>} value
  * @return {!proto.aggregator.FixedEpochCondition} returns this
  */
-proto.aggregator.FixedEpochCondition.prototype.setEpochesList = function(value) {
+proto.aggregator.FixedEpochCondition.prototype.setEpochsList = function(value) {
   return jspb.Message.setField(this, 1, value || []);
 };
 
@@ -2077,7 +2097,7 @@ proto.aggregator.FixedEpochCondition.prototype.setEpochesList = function(value)
  * @param {number=} opt_index
  * @return {!proto.aggregator.FixedEpochCondition} returns this
  */
-proto.aggregator.FixedEpochCondition.prototype.addEpoches = function(value, opt_index) {
+proto.aggregator.FixedEpochCondition.prototype.addEpochs = function(value, opt_index) {
   return jspb.Message.addToRepeatedField(this, 1, value, opt_index);
 };
 
@@ -2086,8 +2106,8 @@ proto.aggregator.FixedEpochCondition.prototype.addEpoches = function(value, opt_
  * Clears the list making it empty but non-null.
  * @return {!proto.aggregator.FixedEpochCondition} returns this
  */
-proto.aggregator.FixedEpochCondition.prototype.clearEpochesList = function() {
-  return this.setEpochesList([]);
+proto.aggregator.FixedEpochCondition.prototype.clearEpochsList = function() {
+  return this.setEpochsList([]);
 };
 
 
@@ -2130,7 +2150,7 @@ proto.aggregator.CronCondition.prototype.toObject = function(opt_includeInstance
  */
 proto.aggregator.CronCondition.toObject = function(includeInstance, msg) {
   var f, obj = {
-    cronTableList: (f = jspb.Message.getRepeatedField(msg, 1)) == null ? undefined : f
+    scheduleList: (f = jspb.Message.getRepeatedField(msg, 1)) == null ? undefined : f
   };
 
   if (includeInstance) {
@@ -2169,7 +2189,7 @@ proto.aggregator.CronCondition.deserializeBinaryFromReader = function(msg, reade
     switch (field) {
     case 1:
       var value = /** @type {string} */ (reader.readString());
-      msg.addCronTable(value);
+      msg.addSchedule(value);
       break;
     default:
       reader.skipField();
@@ -2200,7 +2220,7 @@ proto.aggregator.CronCondition.prototype.serializeBinary = function() {
  */
 proto.aggregator.CronCondition.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getCronTableList();
+  f = message.getScheduleList();
   if (f.length > 0) {
     writer.writeRepeatedString(
       1,
@@ -2211,10 +2231,10 @@ proto.aggregator.CronCondition.serializeBinaryToWriter = function(message, write
 
 
 /**
- * repeated string cron_table = 1;
+ * repeated string schedule = 1;
  * @return {!Array<string>}
  */
-proto.aggregator.CronCondition.prototype.getCronTableList = function() {
+proto.aggregator.CronCondition.prototype.getScheduleList = function() {
   return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 1));
 };
 
@@ -2223,7 +2243,7 @@ proto.aggregator.CronCondition.prototype.getCronTableList = function() {
  * @param {!Array<string>} value
  * @return {!proto.aggregator.CronCondition} returns this
  */
-proto.aggregator.CronCondition.prototype.setCronTableList = function(value) {
+proto.aggregator.CronCondition.prototype.setScheduleList = function(value) {
   return jspb.Message.setField(this, 1, value || []);
 };
 
@@ -2233,7 +2253,7 @@ proto.aggregator.CronCondition.prototype.setCronTableList = function(value) {
  * @param {number=} opt_index
  * @return {!proto.aggregator.CronCondition} returns this
  */
-proto.aggregator.CronCondition.prototype.addCronTable = function(value, opt_index) {
+proto.aggregator.CronCondition.prototype.addSchedule = function(value, opt_index) {
   return jspb.Message.addToRepeatedField(this, 1, value, opt_index);
 };
 
@@ -2242,8 +2262,8 @@ proto.aggregator.CronCondition.prototype.addCronTable = function(value, opt_inde
  * Clears the list making it empty but non-null.
  * @return {!proto.aggregator.CronCondition} returns this
  */
-proto.aggregator.CronCondition.prototype.clearCronTableList = function() {
-  return this.setCronTableList([]);
+proto.aggregator.CronCondition.prototype.clearScheduleList = function() {
+  return this.setScheduleList([]);
 };
 
 
@@ -2516,25 +2536,25 @@ proto.aggregator.EventCondition.prototype.setExpression = function(value) {
  * @private {!Array<!Array<number>>}
  * @const
  */
-proto.aggregator.TaskTrigger.oneofGroups_ = [[2,3,4,5,6]];
+proto.aggregator.TaskTrigger.oneofGroups_ = [[1,2,3,4,5]];
 
 /**
  * @enum {number}
  */
-proto.aggregator.TaskTrigger.TriggerConditionCase = {
-  TRIGGER_CONDITION_NOT_SET: 0,
-  MANUAL: 2,
-  AT: 3,
-  CRON: 4,
-  BLOCK: 5,
-  EVENT: 6
+proto.aggregator.TaskTrigger.TriggerTypeCase = {
+  TRIGGER_TYPE_NOT_SET: 0,
+  MANUAL: 1,
+  FIXED_TIME: 2,
+  CRON: 3,
+  BLOCK: 4,
+  EVENT: 5
 };
 
 /**
- * @return {proto.aggregator.TaskTrigger.TriggerConditionCase}
+ * @return {proto.aggregator.TaskTrigger.TriggerTypeCase}
  */
-proto.aggregator.TaskTrigger.prototype.getTriggerConditionCase = function() {
-  return /** @type {proto.aggregator.TaskTrigger.TriggerConditionCase} */(jspb.Message.computeOneofCase(this, proto.aggregator.TaskTrigger.oneofGroups_[0]));
+proto.aggregator.TaskTrigger.prototype.getTriggerTypeCase = function() {
+  return /** @type {proto.aggregator.TaskTrigger.TriggerTypeCase} */(jspb.Message.computeOneofCase(this, proto.aggregator.TaskTrigger.oneofGroups_[0]));
 };
 
 
@@ -2568,9 +2588,8 @@ proto.aggregator.TaskTrigger.prototype.toObject = function(opt_includeInstance)
  */
 proto.aggregator.TaskTrigger.toObject = function(includeInstance, msg) {
   var f, obj = {
-    triggerType: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    manual: jspb.Message.getBooleanFieldWithDefault(msg, 2, false),
-    at: (f = msg.getAt()) && proto.aggregator.FixedEpochCondition.toObject(includeInstance, f),
+    manual: jspb.Message.getBooleanFieldWithDefault(msg, 1, false),
+    fixedTime: (f = msg.getFixedTime()) && proto.aggregator.FixedEpochCondition.toObject(includeInstance, f),
     cron: (f = msg.getCron()) && proto.aggregator.CronCondition.toObject(includeInstance, f),
     block: (f = msg.getBlock()) && proto.aggregator.BlockCondition.toObject(includeInstance, f),
     event: (f = msg.getEvent()) && proto.aggregator.EventCondition.toObject(includeInstance, f)
@@ -2611,29 +2630,25 @@ proto.aggregator.TaskTrigger.deserializeBinaryFromReader = function(msg, reader)
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {!proto.aggregator.TriggerType} */ (reader.readEnum());
-      msg.setTriggerType(value);
-      break;
-    case 2:
       var value = /** @type {boolean} */ (reader.readBool());
       msg.setManual(value);
       break;
-    case 3:
+    case 2:
       var value = new proto.aggregator.FixedEpochCondition;
       reader.readMessage(value,proto.aggregator.FixedEpochCondition.deserializeBinaryFromReader);
-      msg.setAt(value);
+      msg.setFixedTime(value);
       break;
-    case 4:
+    case 3:
       var value = new proto.aggregator.CronCondition;
       reader.readMessage(value,proto.aggregator.CronCondition.deserializeBinaryFromReader);
       msg.setCron(value);
       break;
-    case 5:
+    case 4:
       var value = new proto.aggregator.BlockCondition;
       reader.readMessage(value,proto.aggregator.BlockCondition.deserializeBinaryFromReader);
       msg.setBlock(value);
       break;
-    case 6:
+    case 5:
       var value = new proto.aggregator.EventCondition;
       reader.readMessage(value,proto.aggregator.EventCondition.deserializeBinaryFromReader);
       msg.setEvent(value);
@@ -2667,24 +2682,17 @@ proto.aggregator.TaskTrigger.prototype.serializeBinary = function() {
  */
 proto.aggregator.TaskTrigger.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getTriggerType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = /** @type {boolean} */ (jspb.Message.getField(message, 2));
+  f = /** @type {boolean} */ (jspb.Message.getField(message, 1));
   if (f != null) {
     writer.writeBool(
-      2,
+      1,
       f
     );
   }
-  f = message.getAt();
+  f = message.getFixedTime();
   if (f != null) {
     writer.writeMessage(
-      3,
+      2,
       f,
       proto.aggregator.FixedEpochCondition.serializeBinaryToWriter
     );
@@ -2692,7 +2700,7 @@ proto.aggregator.TaskTrigger.serializeBinaryToWriter = function(message, writer)
   f = message.getCron();
   if (f != null) {
     writer.writeMessage(
-      4,
+      3,
       f,
       proto.aggregator.CronCondition.serializeBinaryToWriter
     );
@@ -2700,7 +2708,7 @@ proto.aggregator.TaskTrigger.serializeBinaryToWriter = function(message, writer)
   f = message.getBlock();
   if (f != null) {
     writer.writeMessage(
-      5,
+      4,
       f,
       proto.aggregator.BlockCondition.serializeBinaryToWriter
     );
@@ -2708,7 +2716,7 @@ proto.aggregator.TaskTrigger.serializeBinaryToWriter = function(message, writer)
   f = message.getEvent();
   if (f != null) {
     writer.writeMessage(
-      6,
+      5,
       f,
       proto.aggregator.EventCondition.serializeBinaryToWriter
     );
@@ -2717,29 +2725,11 @@ proto.aggregator.TaskTrigger.serializeBinaryToWriter = function(message, writer)
 
 
 /**
- * optional TriggerType trigger_type = 1;
- * @return {!proto.aggregator.TriggerType}
- */
-proto.aggregator.TaskTrigger.prototype.getTriggerType = function() {
-  return /** @type {!proto.aggregator.TriggerType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/**
- * @param {!proto.aggregator.TriggerType} value
- * @return {!proto.aggregator.TaskTrigger} returns this
- */
-proto.aggregator.TaskTrigger.prototype.setTriggerType = function(value) {
-  return jspb.Message.setProto3EnumField(this, 1, value);
-};
-
-
-/**
- * optional bool manual = 2;
+ * optional bool manual = 1;
  * @return {boolean}
  */
 proto.aggregator.TaskTrigger.prototype.getManual = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 2, false));
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 1, false));
 };
 
 
@@ -2748,7 +2738,7 @@ proto.aggregator.TaskTrigger.prototype.getManual = function() {
  * @return {!proto.aggregator.TaskTrigger} returns this
  */
 proto.aggregator.TaskTrigger.prototype.setManual = function(value) {
-  return jspb.Message.setOneofField(this, 2, proto.aggregator.TaskTrigger.oneofGroups_[0], value);
+  return jspb.Message.setOneofField(this, 1, proto.aggregator.TaskTrigger.oneofGroups_[0], value);
 };
 
 
@@ -2757,7 +2747,7 @@ proto.aggregator.TaskTrigger.prototype.setManual = function(value) {
  * @return {!proto.aggregator.TaskTrigger} returns this
  */
 proto.aggregator.TaskTrigger.prototype.clearManual = function() {
-  return jspb.Message.setOneofField(this, 2, proto.aggregator.TaskTrigger.oneofGroups_[0], undefined);
+  return jspb.Message.setOneofField(this, 1, proto.aggregator.TaskTrigger.oneofGroups_[0], undefined);
 };
 
 
@@ -2766,17 +2756,17 @@ proto.aggregator.TaskTrigger.prototype.clearManual = function() {
  * @return {boolean}
  */
 proto.aggregator.TaskTrigger.prototype.hasManual = function() {
-  return jspb.Message.getField(this, 2) != null;
+  return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
- * optional FixedEpochCondition at = 3;
+ * optional FixedEpochCondition fixed_time = 2;
  * @return {?proto.aggregator.FixedEpochCondition}
  */
-proto.aggregator.TaskTrigger.prototype.getAt = function() {
+proto.aggregator.TaskTrigger.prototype.getFixedTime = function() {
   return /** @type{?proto.aggregator.FixedEpochCondition} */ (
-    jspb.Message.getWrapperField(this, proto.aggregator.FixedEpochCondition, 3));
+    jspb.Message.getWrapperField(this, proto.aggregator.FixedEpochCondition, 2));
 };
 
 
@@ -2784,8 +2774,8 @@ proto.aggregator.TaskTrigger.prototype.getAt = function() {
  * @param {?proto.aggregator.FixedEpochCondition|undefined} value
  * @return {!proto.aggregator.TaskTrigger} returns this
 */
-proto.aggregator.TaskTrigger.prototype.setAt = function(value) {
-  return jspb.Message.setOneofWrapperField(this, 3, proto.aggregator.TaskTrigger.oneofGroups_[0], value);
+proto.aggregator.TaskTrigger.prototype.setFixedTime = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 2, proto.aggregator.TaskTrigger.oneofGroups_[0], value);
 };
 
 
@@ -2793,8 +2783,8 @@ proto.aggregator.TaskTrigger.prototype.setAt = function(value) {
  * Clears the message field making it undefined.
  * @return {!proto.aggregator.TaskTrigger} returns this
  */
-proto.aggregator.TaskTrigger.prototype.clearAt = function() {
-  return this.setAt(undefined);
+proto.aggregator.TaskTrigger.prototype.clearFixedTime = function() {
+  return this.setFixedTime(undefined);
 };
 
 
@@ -2802,18 +2792,18 @@ proto.aggregator.TaskTrigger.prototype.clearAt = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.aggregator.TaskTrigger.prototype.hasAt = function() {
-  return jspb.Message.getField(this, 3) != null;
+proto.aggregator.TaskTrigger.prototype.hasFixedTime = function() {
+  return jspb.Message.getField(this, 2) != null;
 };
 
 
 /**
- * optional CronCondition cron = 4;
+ * optional CronCondition cron = 3;
  * @return {?proto.aggregator.CronCondition}
  */
 proto.aggregator.TaskTrigger.prototype.getCron = function() {
   return /** @type{?proto.aggregator.CronCondition} */ (
-    jspb.Message.getWrapperField(this, proto.aggregator.CronCondition, 4));
+    jspb.Message.getWrapperField(this, proto.aggregator.CronCondition, 3));
 };
 
 
@@ -2822,7 +2812,7 @@ proto.aggregator.TaskTrigger.prototype.getCron = function() {
  * @return {!proto.aggregator.TaskTrigger} returns this
 */
 proto.aggregator.TaskTrigger.prototype.setCron = function(value) {
-  return jspb.Message.setOneofWrapperField(this, 4, proto.aggregator.TaskTrigger.oneofGroups_[0], value);
+  return jspb.Message.setOneofWrapperField(this, 3, proto.aggregator.TaskTrigger.oneofGroups_[0], value);
 };
 
 
@@ -2840,17 +2830,17 @@ proto.aggregator.TaskTrigger.prototype.clearCron = function() {
  * @return {boolean}
  */
 proto.aggregator.TaskTrigger.prototype.hasCron = function() {
-  return jspb.Message.getField(this, 4) != null;
+  return jspb.Message.getField(this, 3) != null;
 };
 
 
 /**
- * optional BlockCondition block = 5;
+ * optional BlockCondition block = 4;
  * @return {?proto.aggregator.BlockCondition}
  */
 proto.aggregator.TaskTrigger.prototype.getBlock = function() {
   return /** @type{?proto.aggregator.BlockCondition} */ (
-    jspb.Message.getWrapperField(this, proto.aggregator.BlockCondition, 5));
+    jspb.Message.getWrapperField(this, proto.aggregator.BlockCondition, 4));
 };
 
 
@@ -2859,7 +2849,7 @@ proto.aggregator.TaskTrigger.prototype.getBlock = function() {
  * @return {!proto.aggregator.TaskTrigger} returns this
 */
 proto.aggregator.TaskTrigger.prototype.setBlock = function(value) {
-  return jspb.Message.setOneofWrapperField(this, 5, proto.aggregator.TaskTrigger.oneofGroups_[0], value);
+  return jspb.Message.setOneofWrapperField(this, 4, proto.aggregator.TaskTrigger.oneofGroups_[0], value);
 };
 
 
@@ -2877,17 +2867,17 @@ proto.aggregator.TaskTrigger.prototype.clearBlock = function() {
  * @return {boolean}
  */
 proto.aggregator.TaskTrigger.prototype.hasBlock = function() {
-  return jspb.Message.getField(this, 5) != null;
+  return jspb.Message.getField(this, 4) != null;
 };
 
 
 /**
- * optional EventCondition event = 6;
+ * optional EventCondition event = 5;
  * @return {?proto.aggregator.EventCondition}
  */
 proto.aggregator.TaskTrigger.prototype.getEvent = function() {
   return /** @type{?proto.aggregator.EventCondition} */ (
-    jspb.Message.getWrapperField(this, proto.aggregator.EventCondition, 6));
+    jspb.Message.getWrapperField(this, proto.aggregator.EventCondition, 5));
 };
 
 
@@ -2896,7 +2886,7 @@ proto.aggregator.TaskTrigger.prototype.getEvent = function() {
  * @return {!proto.aggregator.TaskTrigger} returns this
 */
 proto.aggregator.TaskTrigger.prototype.setEvent = function(value) {
-  return jspb.Message.setOneofWrapperField(this, 6, proto.aggregator.TaskTrigger.oneofGroups_[0], value);
+  return jspb.Message.setOneofWrapperField(this, 5, proto.aggregator.TaskTrigger.oneofGroups_[0], value);
 };
 
 
@@ -2914,7 +2904,7 @@ proto.aggregator.TaskTrigger.prototype.clearEvent = function() {
  * @return {boolean}
  */
 proto.aggregator.TaskTrigger.prototype.hasEvent = function() {
-  return jspb.Message.getField(this, 6) != null;
+  return jspb.Message.getField(this, 5) != null;
 };
 
 
@@ -3495,8 +3485,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.aggregator.ContractQueryNode.prototype.toObject = function(opt_includeInstance) {
-  return proto.aggregator.ContractQueryNode.toObject(opt_includeInstance, this);
+proto.aggregator.ContractReadNode.prototype.toObject = function(opt_includeInstance) {
+  return proto.aggregator.ContractReadNode.toObject(opt_includeInstance, this);
 };
 
 
@@ -3505,11 +3495,11 @@ proto.aggregator.ContractQueryNode.prototype.toObject = function(opt_includeInst
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.aggregator.ContractQueryNode} msg The msg instance to transform.
+ * @param {!proto.aggregator.ContractReadNode} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.aggregator.ContractQueryNode.toObject = function(includeInstance, msg) {
+proto.aggregator.ContractReadNode.toObject = function(includeInstance, msg) {
   var f, obj = {
     contractAddress: jspb.Message.getFieldWithDefault(msg, 1, ""),
     callData: jspb.Message.getFieldWithDefault(msg, 2, ""),
@@ -3527,23 +3517,23 @@ proto.aggregator.ContractQueryNode.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.aggregator.ContractQueryNode}
+ * @return {!proto.aggregator.ContractReadNode}
  */
-proto.aggregator.ContractQueryNode.deserializeBinary = function(bytes) {
+proto.aggregator.ContractReadNode.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.aggregator.ContractQueryNode;
-  return proto.aggregator.ContractQueryNode.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.aggregator.ContractReadNode;
+  return proto.aggregator.ContractReadNode.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.aggregator.ContractQueryNode} msg The message object to deserialize into.
+ * @param {!proto.aggregator.ContractReadNode} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.aggregator.ContractQueryNode}
+ * @return {!proto.aggregator.ContractReadNode}
  */
-proto.aggregator.ContractQueryNode.deserializeBinaryFromReader = function(msg, reader) {
+proto.aggregator.ContractReadNode.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -3575,9 +3565,9 @@ proto.aggregator.ContractQueryNode.deserializeBinaryFromReader = function(msg, r
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.aggregator.ContractQueryNode.prototype.serializeBinary = function() {
+proto.aggregator.ContractReadNode.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.aggregator.ContractQueryNode.serializeBinaryToWriter(this, writer);
+  proto.aggregator.ContractReadNode.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -3585,11 +3575,11 @@ proto.aggregator.ContractQueryNode.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.aggregator.ContractQueryNode} message
+ * @param {!proto.aggregator.ContractReadNode} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.aggregator.ContractQueryNode.serializeBinaryToWriter = function(message, writer) {
+proto.aggregator.ContractReadNode.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getContractAddress();
   if (f.length > 0) {
@@ -3619,16 +3609,16 @@ proto.aggregator.ContractQueryNode.serializeBinaryToWriter = function(message, w
  * optional string contract_address = 1;
  * @return {string}
  */
-proto.aggregator.ContractQueryNode.prototype.getContractAddress = function() {
+proto.aggregator.ContractReadNode.prototype.getContractAddress = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.aggregator.ContractQueryNode} returns this
+ * @return {!proto.aggregator.ContractReadNode} returns this
  */
-proto.aggregator.ContractQueryNode.prototype.setContractAddress = function(value) {
+proto.aggregator.ContractReadNode.prototype.setContractAddress = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 
@@ -3637,16 +3627,16 @@ proto.aggregator.ContractQueryNode.prototype.setContractAddress = function(value
  * optional string call_data = 2;
  * @return {string}
  */
-proto.aggregator.ContractQueryNode.prototype.getCallData = function() {
+proto.aggregator.ContractReadNode.prototype.getCallData = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.aggregator.ContractQueryNode} returns this
+ * @return {!proto.aggregator.ContractReadNode} returns this
  */
-proto.aggregator.ContractQueryNode.prototype.setCallData = function(value) {
+proto.aggregator.ContractReadNode.prototype.setCallData = function(value) {
   return jspb.Message.setProto3StringField(this, 2, value);
 };
 
@@ -3655,16 +3645,16 @@ proto.aggregator.ContractQueryNode.prototype.setCallData = function(value) {
  * optional string contract_abi = 3;
  * @return {string}
  */
-proto.aggregator.ContractQueryNode.prototype.getContractAbi = function() {
+proto.aggregator.ContractReadNode.prototype.getContractAbi = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.aggregator.ContractQueryNode} returns this
+ * @return {!proto.aggregator.ContractReadNode} returns this
  */
-proto.aggregator.ContractQueryNode.prototype.setContractAbi = function(value) {
+proto.aggregator.ContractReadNode.prototype.setContractAbi = function(value) {
   return jspb.Message.setProto3StringField(this, 3, value);
 };
 
@@ -3702,7 +3692,8 @@ proto.aggregator.GraphQLQueryNode.prototype.toObject = function(opt_includeInsta
 proto.aggregator.GraphQLQueryNode.toObject = function(includeInstance, msg) {
   var f, obj = {
     url: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    query: jspb.Message.getFieldWithDefault(msg, 2, "")
+    query: jspb.Message.getFieldWithDefault(msg, 2, ""),
+    variablesMap: (f = msg.getVariablesMap()) ? f.toObject(includeInstance, undefined) : []
   };
 
   if (includeInstance) {
@@ -3747,6 +3738,12 @@ proto.aggregator.GraphQLQueryNode.deserializeBinaryFromReader = function(msg, re
       var value = /** @type {string} */ (reader.readString());
       msg.setQuery(value);
       break;
+    case 3:
+      var value = msg.getVariablesMap();
+      reader.readMessage(value, function(message, reader) {
+        jspb.Map.deserializeBinary(message, reader, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, "", "");
+         });
+      break;
     default:
       reader.skipField();
       break;
@@ -3790,6 +3787,10 @@ proto.aggregator.GraphQLQueryNode.serializeBinaryToWriter = function(message, wr
       f
     );
   }
+  f = message.getVariablesMap(true);
+  if (f && f.getLength() > 0) {
+    f.serializeBinary(3, writer, jspb.BinaryWriter.prototype.writeString, jspb.BinaryWriter.prototype.writeString);
+  }
 };
 
 
@@ -3829,6 +3830,28 @@ proto.aggregator.GraphQLQueryNode.prototype.setQuery = function(value) {
 };
 
 
+/**
+ * map<string, string> variables = 3;
+ * @param {boolean=} opt_noLazyCreate Do not create the map if
+ * empty, instead returning `undefined`
+ * @return {!jspb.Map<string,string>}
+ */
+proto.aggregator.GraphQLQueryNode.prototype.getVariablesMap = function(opt_noLazyCreate) {
+  return /** @type {!jspb.Map<string,string>} */ (
+      jspb.Message.getMapField(this, 3, opt_noLazyCreate,
+      null));
+};
+
+
+/**
+ * Clears values from the map. The map will be non-null.
+ * @return {!proto.aggregator.GraphQLQueryNode} returns this
+ */
+proto.aggregator.GraphQLQueryNode.prototype.clearVariablesMap = function() {
+  this.getVariablesMap().clear();
+  return this;};
+
+
 
 
 
@@ -3863,7 +3886,8 @@ proto.aggregator.RestAPINode.toObject = function(includeInstance, msg) {
   var f, obj = {
     url: jspb.Message.getFieldWithDefault(msg, 1, ""),
     headersMap: (f = msg.getHeadersMap()) ? f.toObject(includeInstance, undefined) : [],
-    body: jspb.Message.getFieldWithDefault(msg, 3, "")
+    body: jspb.Message.getFieldWithDefault(msg, 3, ""),
+    method: jspb.Message.getFieldWithDefault(msg, 4, "")
   };
 
   if (includeInstance) {
@@ -3914,6 +3938,10 @@ proto.aggregator.RestAPINode.deserializeBinaryFromReader = function(msg, reader)
       var value = /** @type {string} */ (reader.readString());
       msg.setBody(value);
       break;
+    case 4:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setMethod(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -3961,6 +3989,13 @@ proto.aggregator.RestAPINode.serializeBinaryToWriter = function(message, writer)
       f
     );
   }
+  f = message.getMethod();
+  if (f.length > 0) {
+    writer.writeString(
+      4,
+      f
+    );
+  }
 };
 
 
@@ -4022,6 +4057,24 @@ proto.aggregator.RestAPINode.prototype.setBody = function(value) {
 };
 
 
+/**
+ * optional string method = 4;
+ * @return {string}
+ */
+proto.aggregator.RestAPINode.prototype.getMethod = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.aggregator.RestAPINode} returns this
+ */
+proto.aggregator.RestAPINode.prototype.setMethod = function(value) {
+  return jspb.Message.setProto3StringField(this, 4, value);
+};
+
+
 
 
 
@@ -4198,8 +4251,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.aggregator.ConditionJump.prototype.toObject = function(opt_includeInstance) {
-  return proto.aggregator.ConditionJump.toObject(opt_includeInstance, this);
+proto.aggregator.Condition.prototype.toObject = function(opt_includeInstance) {
+  return proto.aggregator.Condition.toObject(opt_includeInstance, this);
 };
 
 
@@ -4208,14 +4261,15 @@ proto.aggregator.ConditionJump.prototype.toObject = function(opt_includeInstance
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.aggregator.ConditionJump} msg The msg instance to transform.
+ * @param {!proto.aggregator.Condition} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.aggregator.ConditionJump.toObject = function(includeInstance, msg) {
+proto.aggregator.Condition.toObject = function(includeInstance, msg) {
   var f, obj = {
-    expression: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    next: jspb.Message.getFieldWithDefault(msg, 2, "")
+    id: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    type: jspb.Message.getFieldWithDefault(msg, 2, ""),
+    expression: jspb.Message.getFieldWithDefault(msg, 3, "")
   };
 
   if (includeInstance) {
@@ -4229,23 +4283,23 @@ proto.aggregator.ConditionJump.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.aggregator.ConditionJump}
+ * @return {!proto.aggregator.Condition}
  */
-proto.aggregator.ConditionJump.deserializeBinary = function(bytes) {
+proto.aggregator.Condition.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.aggregator.ConditionJump;
-  return proto.aggregator.ConditionJump.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.aggregator.Condition;
+  return proto.aggregator.Condition.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.aggregator.ConditionJump} msg The message object to deserialize into.
+ * @param {!proto.aggregator.Condition} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.aggregator.ConditionJump}
+ * @return {!proto.aggregator.Condition}
  */
-proto.aggregator.ConditionJump.deserializeBinaryFromReader = function(msg, reader) {
+proto.aggregator.Condition.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -4254,11 +4308,15 @@ proto.aggregator.ConditionJump.deserializeBinaryFromReader = function(msg, reade
     switch (field) {
     case 1:
       var value = /** @type {string} */ (reader.readString());
-      msg.setExpression(value);
+      msg.setId(value);
       break;
     case 2:
       var value = /** @type {string} */ (reader.readString());
-      msg.setNext(value);
+      msg.setType(value);
+      break;
+    case 3:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setExpression(value);
       break;
     default:
       reader.skipField();
@@ -4273,9 +4331,9 @@ proto.aggregator.ConditionJump.deserializeBinaryFromReader = function(msg, reade
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.aggregator.ConditionJump.prototype.serializeBinary = function() {
+proto.aggregator.Condition.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.aggregator.ConditionJump.serializeBinaryToWriter(this, writer);
+  proto.aggregator.Condition.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -4283,72 +4341,97 @@ proto.aggregator.ConditionJump.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.aggregator.ConditionJump} message
+ * @param {!proto.aggregator.Condition} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.aggregator.ConditionJump.serializeBinaryToWriter = function(message, writer) {
+proto.aggregator.Condition.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getExpression();
+  f = message.getId();
   if (f.length > 0) {
     writer.writeString(
       1,
       f
     );
   }
-  f = message.getNext();
+  f = message.getType();
   if (f.length > 0) {
     writer.writeString(
       2,
       f
     );
   }
+  f = message.getExpression();
+  if (f.length > 0) {
+    writer.writeString(
+      3,
+      f
+    );
+  }
 };
 
 
 /**
- * optional string expression = 1;
+ * optional string id = 1;
  * @return {string}
  */
-proto.aggregator.ConditionJump.prototype.getExpression = function() {
+proto.aggregator.Condition.prototype.getId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.aggregator.ConditionJump} returns this
+ * @return {!proto.aggregator.Condition} returns this
  */
-proto.aggregator.ConditionJump.prototype.setExpression = function(value) {
+proto.aggregator.Condition.prototype.setId = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 
 
 /**
- * optional string next = 2;
+ * optional string type = 2;
  * @return {string}
  */
-proto.aggregator.ConditionJump.prototype.getNext = function() {
+proto.aggregator.Condition.prototype.getType = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.aggregator.ConditionJump} returns this
+ * @return {!proto.aggregator.Condition} returns this
  */
-proto.aggregator.ConditionJump.prototype.setNext = function(value) {
+proto.aggregator.Condition.prototype.setType = function(value) {
   return jspb.Message.setProto3StringField(this, 2, value);
 };
 
 
+/**
+ * optional string expression = 3;
+ * @return {string}
+ */
+proto.aggregator.Condition.prototype.getExpression = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.aggregator.Condition} returns this
+ */
+proto.aggregator.Condition.prototype.setExpression = function(value) {
+  return jspb.Message.setProto3StringField(this, 3, value);
+};
+
+
 
 /**
  * List of repeated fields within this message type.
  * @private {!Array<number>}
  * @const
  */
-proto.aggregator.BranchNode.repeatedFields_ = [2];
+proto.aggregator.BranchNode.repeatedFields_ = [1];
 
 
 
@@ -4381,10 +4464,8 @@ proto.aggregator.BranchNode.prototype.toObject = function(opt_includeInstance) {
  */
 proto.aggregator.BranchNode.toObject = function(includeInstance, msg) {
   var f, obj = {
-    pb_if: (f = msg.getIf()) && proto.aggregator.ConditionJump.toObject(includeInstance, f),
-    elseifsList: jspb.Message.toObjectList(msg.getElseifsList(),
-    proto.aggregator.ConditionJump.toObject, includeInstance),
-    pb_else: (f = msg.getElse()) && proto.aggregator.ConditionJump.toObject(includeInstance, f)
+    conditionsList: jspb.Message.toObjectList(msg.getConditionsList(),
+    proto.aggregator.Condition.toObject, includeInstance)
   };
 
   if (includeInstance) {
@@ -4422,19 +4503,9 @@ proto.aggregator.BranchNode.deserializeBinaryFromReader = function(msg, reader)
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = new proto.aggregator.ConditionJump;
-      reader.readMessage(value,proto.aggregator.ConditionJump.deserializeBinaryFromReader);
-      msg.setIf(value);
-      break;
-    case 2:
-      var value = new proto.aggregator.ConditionJump;
-      reader.readMessage(value,proto.aggregator.ConditionJump.deserializeBinaryFromReader);
-      msg.addElseifs(value);
-      break;
-    case 3:
-      var value = new proto.aggregator.ConditionJump;
-      reader.readMessage(value,proto.aggregator.ConditionJump.deserializeBinaryFromReader);
-      msg.setElse(value);
+      var value = new proto.aggregator.Condition;
+      reader.readMessage(value,proto.aggregator.Condition.deserializeBinaryFromReader);
+      msg.addConditions(value);
       break;
     default:
       reader.skipField();
@@ -4465,142 +4536,182 @@ proto.aggregator.BranchNode.prototype.serializeBinary = function() {
  */
 proto.aggregator.BranchNode.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getIf();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.aggregator.ConditionJump.serializeBinaryToWriter
-    );
-  }
-  f = message.getElseifsList();
+  f = message.getConditionsList();
   if (f.length > 0) {
     writer.writeRepeatedMessage(
-      2,
-      f,
-      proto.aggregator.ConditionJump.serializeBinaryToWriter
-    );
-  }
-  f = message.getElse();
-  if (f != null) {
-    writer.writeMessage(
-      3,
+      1,
       f,
-      proto.aggregator.ConditionJump.serializeBinaryToWriter
+      proto.aggregator.Condition.serializeBinaryToWriter
     );
   }
 };
 
 
 /**
- * optional ConditionJump if = 1;
- * @return {?proto.aggregator.ConditionJump}
+ * repeated Condition conditions = 1;
+ * @return {!Array<!proto.aggregator.Condition>}
  */
-proto.aggregator.BranchNode.prototype.getIf = function() {
-  return /** @type{?proto.aggregator.ConditionJump} */ (
-    jspb.Message.getWrapperField(this, proto.aggregator.ConditionJump, 1));
+proto.aggregator.BranchNode.prototype.getConditionsList = function() {
+  return /** @type{!Array<!proto.aggregator.Condition>} */ (
+    jspb.Message.getRepeatedWrapperField(this, proto.aggregator.Condition, 1));
 };
 
 
 /**
- * @param {?proto.aggregator.ConditionJump|undefined} value
+ * @param {!Array<!proto.aggregator.Condition>} value
  * @return {!proto.aggregator.BranchNode} returns this
 */
-proto.aggregator.BranchNode.prototype.setIf = function(value) {
-  return jspb.Message.setWrapperField(this, 1, value);
+proto.aggregator.BranchNode.prototype.setConditionsList = function(value) {
+  return jspb.Message.setRepeatedWrapperField(this, 1, value);
 };
 
 
 /**
- * Clears the message field making it undefined.
- * @return {!proto.aggregator.BranchNode} returns this
+ * @param {!proto.aggregator.Condition=} opt_value
+ * @param {number=} opt_index
+ * @return {!proto.aggregator.Condition}
  */
-proto.aggregator.BranchNode.prototype.clearIf = function() {
-  return this.setIf(undefined);
+proto.aggregator.BranchNode.prototype.addConditions = function(opt_value, opt_index) {
+  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.aggregator.Condition, opt_index);
 };
 
 
 /**
- * Returns whether this field is set.
- * @return {boolean}
+ * Clears the list making it empty but non-null.
+ * @return {!proto.aggregator.BranchNode} returns this
  */
-proto.aggregator.BranchNode.prototype.hasIf = function() {
-  return jspb.Message.getField(this, 1) != null;
+proto.aggregator.BranchNode.prototype.clearConditionsList = function() {
+  return this.setConditionsList([]);
 };
 
 
+
+
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
 /**
- * repeated ConditionJump elseIfs = 2;
- * @return {!Array<!proto.aggregator.ConditionJump>}
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
  */
-proto.aggregator.BranchNode.prototype.getElseifsList = function() {
-  return /** @type{!Array<!proto.aggregator.ConditionJump>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.aggregator.ConditionJump, 2));
+proto.aggregator.FilterNode.prototype.toObject = function(opt_includeInstance) {
+  return proto.aggregator.FilterNode.toObject(opt_includeInstance, this);
 };
 
 
 /**
- * @param {!Array<!proto.aggregator.ConditionJump>} value
- * @return {!proto.aggregator.BranchNode} returns this
-*/
-proto.aggregator.BranchNode.prototype.setElseifsList = function(value) {
-  return jspb.Message.setRepeatedWrapperField(this, 2, value);
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.aggregator.FilterNode} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.aggregator.FilterNode.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    expression: jspb.Message.getFieldWithDefault(msg, 1, "")
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
 };
+}
 
 
 /**
- * @param {!proto.aggregator.ConditionJump=} opt_value
- * @param {number=} opt_index
- * @return {!proto.aggregator.ConditionJump}
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.aggregator.FilterNode}
  */
-proto.aggregator.BranchNode.prototype.addElseifs = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 2, opt_value, proto.aggregator.ConditionJump, opt_index);
+proto.aggregator.FilterNode.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.aggregator.FilterNode;
+  return proto.aggregator.FilterNode.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
- * Clears the list making it empty but non-null.
- * @return {!proto.aggregator.BranchNode} returns this
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.aggregator.FilterNode} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.aggregator.FilterNode}
  */
-proto.aggregator.BranchNode.prototype.clearElseifsList = function() {
-  return this.setElseifsList([]);
+proto.aggregator.FilterNode.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setExpression(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
 };
 
 
 /**
- * optional ConditionJump else = 3;
- * @return {?proto.aggregator.ConditionJump}
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
  */
-proto.aggregator.BranchNode.prototype.getElse = function() {
-  return /** @type{?proto.aggregator.ConditionJump} */ (
-    jspb.Message.getWrapperField(this, proto.aggregator.ConditionJump, 3));
+proto.aggregator.FilterNode.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.aggregator.FilterNode.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
 };
 
 
 /**
- * @param {?proto.aggregator.ConditionJump|undefined} value
- * @return {!proto.aggregator.BranchNode} returns this
-*/
-proto.aggregator.BranchNode.prototype.setElse = function(value) {
-  return jspb.Message.setWrapperField(this, 3, value);
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.aggregator.FilterNode} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.aggregator.FilterNode.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getExpression();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
 };
 
 
 /**
- * Clears the message field making it undefined.
- * @return {!proto.aggregator.BranchNode} returns this
+ * optional string expression = 1;
+ * @return {string}
  */
-proto.aggregator.BranchNode.prototype.clearElse = function() {
-  return this.setElse(undefined);
+proto.aggregator.FilterNode.prototype.getExpression = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
- * Returns whether this field is set.
- * @return {boolean}
+ * @param {string} value
+ * @return {!proto.aggregator.FilterNode} returns this
  */
-proto.aggregator.BranchNode.prototype.hasElse = function() {
-  return jspb.Message.getField(this, 3) != null;
+proto.aggregator.FilterNode.prototype.setExpression = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
 };
 
 
@@ -4620,8 +4731,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.aggregator.FilterNode.prototype.toObject = function(opt_includeInstance) {
-  return proto.aggregator.FilterNode.toObject(opt_includeInstance, this);
+proto.aggregator.LoopNode.prototype.toObject = function(opt_includeInstance) {
+  return proto.aggregator.LoopNode.toObject(opt_includeInstance, this);
 };
 
 
@@ -4630,13 +4741,14 @@ proto.aggregator.FilterNode.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.aggregator.FilterNode} msg The msg instance to transform.
+ * @param {!proto.aggregator.LoopNode} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.aggregator.FilterNode.toObject = function(includeInstance, msg) {
+proto.aggregator.LoopNode.toObject = function(includeInstance, msg) {
   var f, obj = {
-    expression: jspb.Message.getFieldWithDefault(msg, 1, "")
+    iterVar: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    iterKey: jspb.Message.getFieldWithDefault(msg, 2, "")
   };
 
   if (includeInstance) {
@@ -4650,23 +4762,23 @@ proto.aggregator.FilterNode.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.aggregator.FilterNode}
+ * @return {!proto.aggregator.LoopNode}
  */
-proto.aggregator.FilterNode.deserializeBinary = function(bytes) {
+proto.aggregator.LoopNode.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.aggregator.FilterNode;
-  return proto.aggregator.FilterNode.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.aggregator.LoopNode;
+  return proto.aggregator.LoopNode.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.aggregator.FilterNode} msg The message object to deserialize into.
+ * @param {!proto.aggregator.LoopNode} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.aggregator.FilterNode}
+ * @return {!proto.aggregator.LoopNode}
  */
-proto.aggregator.FilterNode.deserializeBinaryFromReader = function(msg, reader) {
+proto.aggregator.LoopNode.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -4675,7 +4787,11 @@ proto.aggregator.FilterNode.deserializeBinaryFromReader = function(msg, reader)
     switch (field) {
     case 1:
       var value = /** @type {string} */ (reader.readString());
-      msg.setExpression(value);
+      msg.setIterVar(value);
+      break;
+    case 2:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setIterKey(value);
       break;
     default:
       reader.skipField();
@@ -4690,9 +4806,9 @@ proto.aggregator.FilterNode.deserializeBinaryFromReader = function(msg, reader)
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.aggregator.FilterNode.prototype.serializeBinary = function() {
+proto.aggregator.LoopNode.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.aggregator.FilterNode.serializeBinaryToWriter(this, writer);
+  proto.aggregator.LoopNode.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -4700,40 +4816,65 @@ proto.aggregator.FilterNode.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.aggregator.FilterNode} message
+ * @param {!proto.aggregator.LoopNode} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.aggregator.FilterNode.serializeBinaryToWriter = function(message, writer) {
+proto.aggregator.LoopNode.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getExpression();
+  f = message.getIterVar();
   if (f.length > 0) {
     writer.writeString(
       1,
       f
     );
   }
+  f = message.getIterKey();
+  if (f.length > 0) {
+    writer.writeString(
+      2,
+      f
+    );
+  }
 };
 
 
 /**
- * optional string expression = 1;
+ * optional string iter_var = 1;
  * @return {string}
  */
-proto.aggregator.FilterNode.prototype.getExpression = function() {
+proto.aggregator.LoopNode.prototype.getIterVar = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.aggregator.FilterNode} returns this
+ * @return {!proto.aggregator.LoopNode} returns this
  */
-proto.aggregator.FilterNode.prototype.setExpression = function(value) {
+proto.aggregator.LoopNode.prototype.setIterVar = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 
 
+/**
+ * optional string iter_key = 2;
+ * @return {string}
+ */
+proto.aggregator.LoopNode.prototype.getIterKey = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.aggregator.LoopNode} returns this
+ */
+proto.aggregator.LoopNode.prototype.setIterKey = function(value) {
+  return jspb.Message.setProto3StringField(this, 2, value);
+};
+
+
 
 
 
@@ -4933,13 +5074,13 @@ proto.aggregator.TaskEdge.prototype.setTarget = function(value) {
  * @private {!Array<!Array<number>>}
  * @const
  */
-proto.aggregator.TaskNode.oneofGroups_ = [[10,11,12,13,14,15,16,17]];
+proto.aggregator.TaskNode.oneofGroups_ = [[10,11,12,13,14,15,16,17,18]];
 
 /**
  * @enum {number}
  */
-proto.aggregator.TaskNode.TaskBodyCase = {
-  TASK_BODY_NOT_SET: 0,
+proto.aggregator.TaskNode.TaskTypeCase = {
+  TASK_TYPE_NOT_SET: 0,
   ETH_TRANSFER: 10,
   CONTRACT_WRITE: 11,
   CONTRACT_READ: 12,
@@ -4947,14 +5088,15 @@ proto.aggregator.TaskNode.TaskBodyCase = {
   REST_API: 14,
   BRANCH: 15,
   FILTER: 16,
-  CUSTOM_CODE: 17
+  LOOP: 17,
+  CUSTOM_CODE: 18
 };
 
 /**
- * @return {proto.aggregator.TaskNode.TaskBodyCase}
+ * @return {proto.aggregator.TaskNode.TaskTypeCase}
  */
-proto.aggregator.TaskNode.prototype.getTaskBodyCase = function() {
-  return /** @type {proto.aggregator.TaskNode.TaskBodyCase} */(jspb.Message.computeOneofCase(this, proto.aggregator.TaskNode.oneofGroups_[0]));
+proto.aggregator.TaskNode.prototype.getTaskTypeCase = function() {
+  return /** @type {proto.aggregator.TaskNode.TaskTypeCase} */(jspb.Message.computeOneofCase(this, proto.aggregator.TaskNode.oneofGroups_[0]));
 };
 
 
@@ -4988,16 +5130,16 @@ proto.aggregator.TaskNode.prototype.toObject = function(opt_includeInstance) {
  */
 proto.aggregator.TaskNode.toObject = function(includeInstance, msg) {
   var f, obj = {
-    nodeType: jspb.Message.getFieldWithDefault(msg, 1, 0),
     id: jspb.Message.getFieldWithDefault(msg, 2, ""),
     name: jspb.Message.getFieldWithDefault(msg, 3, ""),
     ethTransfer: (f = msg.getEthTransfer()) && proto.aggregator.ETHTransferNode.toObject(includeInstance, f),
     contractWrite: (f = msg.getContractWrite()) && proto.aggregator.ContractWriteNode.toObject(includeInstance, f),
-    contractRead: (f = msg.getContractRead()) && proto.aggregator.ContractQueryNode.toObject(includeInstance, f),
+    contractRead: (f = msg.getContractRead()) && proto.aggregator.ContractReadNode.toObject(includeInstance, f),
     graphqlDataQuery: (f = msg.getGraphqlDataQuery()) && proto.aggregator.GraphQLQueryNode.toObject(includeInstance, f),
     restApi: (f = msg.getRestApi()) && proto.aggregator.RestAPINode.toObject(includeInstance, f),
     branch: (f = msg.getBranch()) && proto.aggregator.BranchNode.toObject(includeInstance, f),
     filter: (f = msg.getFilter()) && proto.aggregator.FilterNode.toObject(includeInstance, f),
+    loop: (f = msg.getLoop()) && proto.aggregator.LoopNode.toObject(includeInstance, f),
     customCode: (f = msg.getCustomCode()) && proto.aggregator.CustomCodeNode.toObject(includeInstance, f)
   };
 
@@ -5035,10 +5177,6 @@ proto.aggregator.TaskNode.deserializeBinaryFromReader = function(msg, reader) {
     }
     var field = reader.getFieldNumber();
     switch (field) {
-    case 1:
-      var value = /** @type {!proto.aggregator.TaskType} */ (reader.readEnum());
-      msg.setNodeType(value);
-      break;
     case 2:
       var value = /** @type {string} */ (reader.readString());
       msg.setId(value);
@@ -5058,8 +5196,8 @@ proto.aggregator.TaskNode.deserializeBinaryFromReader = function(msg, reader) {
       msg.setContractWrite(value);
       break;
     case 12:
-      var value = new proto.aggregator.ContractQueryNode;
-      reader.readMessage(value,proto.aggregator.ContractQueryNode.deserializeBinaryFromReader);
+      var value = new proto.aggregator.ContractReadNode;
+      reader.readMessage(value,proto.aggregator.ContractReadNode.deserializeBinaryFromReader);
       msg.setContractRead(value);
       break;
     case 13:
@@ -5083,6 +5221,11 @@ proto.aggregator.TaskNode.deserializeBinaryFromReader = function(msg, reader) {
       msg.setFilter(value);
       break;
     case 17:
+      var value = new proto.aggregator.LoopNode;
+      reader.readMessage(value,proto.aggregator.LoopNode.deserializeBinaryFromReader);
+      msg.setLoop(value);
+      break;
+    case 18:
       var value = new proto.aggregator.CustomCodeNode;
       reader.readMessage(value,proto.aggregator.CustomCodeNode.deserializeBinaryFromReader);
       msg.setCustomCode(value);
@@ -5116,13 +5259,6 @@ proto.aggregator.TaskNode.prototype.serializeBinary = function() {
  */
 proto.aggregator.TaskNode.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getNodeType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
   f = message.getId();
   if (f.length > 0) {
     writer.writeString(
@@ -5158,7 +5294,7 @@ proto.aggregator.TaskNode.serializeBinaryToWriter = function(message, writer) {
     writer.writeMessage(
       12,
       f,
-      proto.aggregator.ContractQueryNode.serializeBinaryToWriter
+      proto.aggregator.ContractReadNode.serializeBinaryToWriter
     );
   }
   f = message.getGraphqlDataQuery();
@@ -5193,35 +5329,25 @@ proto.aggregator.TaskNode.serializeBinaryToWriter = function(message, writer) {
       proto.aggregator.FilterNode.serializeBinaryToWriter
     );
   }
-  f = message.getCustomCode();
+  f = message.getLoop();
   if (f != null) {
     writer.writeMessage(
       17,
       f,
+      proto.aggregator.LoopNode.serializeBinaryToWriter
+    );
+  }
+  f = message.getCustomCode();
+  if (f != null) {
+    writer.writeMessage(
+      18,
+      f,
       proto.aggregator.CustomCodeNode.serializeBinaryToWriter
     );
   }
 };
 
 
-/**
- * optional TaskType node_type = 1;
- * @return {!proto.aggregator.TaskType}
- */
-proto.aggregator.TaskNode.prototype.getNodeType = function() {
-  return /** @type {!proto.aggregator.TaskType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/**
- * @param {!proto.aggregator.TaskType} value
- * @return {!proto.aggregator.TaskNode} returns this
- */
-proto.aggregator.TaskNode.prototype.setNodeType = function(value) {
-  return jspb.Message.setProto3EnumField(this, 1, value);
-};
-
-
 /**
  * optional string id = 2;
  * @return {string}
@@ -5333,17 +5459,17 @@ proto.aggregator.TaskNode.prototype.hasContractWrite = function() {
 
 
 /**
- * optional ContractQueryNode contract_read = 12;
- * @return {?proto.aggregator.ContractQueryNode}
+ * optional ContractReadNode contract_read = 12;
+ * @return {?proto.aggregator.ContractReadNode}
  */
 proto.aggregator.TaskNode.prototype.getContractRead = function() {
-  return /** @type{?proto.aggregator.ContractQueryNode} */ (
-    jspb.Message.getWrapperField(this, proto.aggregator.ContractQueryNode, 12));
+  return /** @type{?proto.aggregator.ContractReadNode} */ (
+    jspb.Message.getWrapperField(this, proto.aggregator.ContractReadNode, 12));
 };
 
 
 /**
- * @param {?proto.aggregator.ContractQueryNode|undefined} value
+ * @param {?proto.aggregator.ContractReadNode|undefined} value
  * @return {!proto.aggregator.TaskNode} returns this
 */
 proto.aggregator.TaskNode.prototype.setContractRead = function(value) {
@@ -5518,12 +5644,49 @@ proto.aggregator.TaskNode.prototype.hasFilter = function() {
 
 
 /**
- * optional CustomCodeNode custom_code = 17;
+ * optional LoopNode loop = 17;
+ * @return {?proto.aggregator.LoopNode}
+ */
+proto.aggregator.TaskNode.prototype.getLoop = function() {
+  return /** @type{?proto.aggregator.LoopNode} */ (
+    jspb.Message.getWrapperField(this, proto.aggregator.LoopNode, 17));
+};
+
+
+/**
+ * @param {?proto.aggregator.LoopNode|undefined} value
+ * @return {!proto.aggregator.TaskNode} returns this
+*/
+proto.aggregator.TaskNode.prototype.setLoop = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 17, proto.aggregator.TaskNode.oneofGroups_[0], value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.aggregator.TaskNode} returns this
+ */
+proto.aggregator.TaskNode.prototype.clearLoop = function() {
+  return this.setLoop(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.aggregator.TaskNode.prototype.hasLoop = function() {
+  return jspb.Message.getField(this, 17) != null;
+};
+
+
+/**
+ * optional CustomCodeNode custom_code = 18;
  * @return {?proto.aggregator.CustomCodeNode}
  */
 proto.aggregator.TaskNode.prototype.getCustomCode = function() {
   return /** @type{?proto.aggregator.CustomCodeNode} */ (
-    jspb.Message.getWrapperField(this, proto.aggregator.CustomCodeNode, 17));
+    jspb.Message.getWrapperField(this, proto.aggregator.CustomCodeNode, 18));
 };
 
 
@@ -5532,7 +5695,7 @@ proto.aggregator.TaskNode.prototype.getCustomCode = function() {
  * @return {!proto.aggregator.TaskNode} returns this
 */
 proto.aggregator.TaskNode.prototype.setCustomCode = function(value) {
-  return jspb.Message.setOneofWrapperField(this, 17, proto.aggregator.TaskNode.oneofGroups_[0], value);
+  return jspb.Message.setOneofWrapperField(this, 18, proto.aggregator.TaskNode.oneofGroups_[0], value);
 };
 
 
@@ -5550,7 +5713,7 @@ proto.aggregator.TaskNode.prototype.clearCustomCode = function() {
  * @return {boolean}
  */
 proto.aggregator.TaskNode.prototype.hasCustomCode = function() {
-  return jspb.Message.getField(this, 17) != null;
+  return jspb.Message.getField(this, 18) != null;
 };
 
 
@@ -5783,14 +5946,14 @@ proto.aggregator.Task.prototype.toObject = function(opt_includeInstance) {
  */
 proto.aggregator.Task.toObject = function(includeInstance, msg) {
   var f, obj = {
-    id: (f = msg.getId()) && proto.aggregator.UUID.toObject(includeInstance, f),
+    id: jspb.Message.getFieldWithDefault(msg, 1, ""),
     owner: jspb.Message.getFieldWithDefault(msg, 2, ""),
     smartWalletAddress: jspb.Message.getFieldWithDefault(msg, 3, ""),
-    startAt: jspb.Message.getFieldWithDefault(msg, 5, 0),
-    expiredAt: jspb.Message.getFieldWithDefault(msg, 6, 0),
-    memo: jspb.Message.getFieldWithDefault(msg, 7, ""),
-    completedAt: jspb.Message.getFieldWithDefault(msg, 8, 0),
-    recurring: jspb.Message.getBooleanFieldWithDefault(msg, 10, false),
+    startAt: jspb.Message.getFieldWithDefault(msg, 4, 0),
+    expiredAt: jspb.Message.getFieldWithDefault(msg, 5, 0),
+    memo: jspb.Message.getFieldWithDefault(msg, 6, ""),
+    completedAt: jspb.Message.getFieldWithDefault(msg, 7, 0),
+    maxExecution: jspb.Message.getFieldWithDefault(msg, 8, 0),
     status: jspb.Message.getFieldWithDefault(msg, 9, 0),
     trigger: (f = msg.getTrigger()) && proto.aggregator.TaskTrigger.toObject(includeInstance, f),
     nodesList: jspb.Message.toObjectList(msg.getNodesList(),
@@ -5836,8 +5999,7 @@ proto.aggregator.Task.deserializeBinaryFromReader = function(msg, reader) {
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = new proto.aggregator.UUID;
-      reader.readMessage(value,proto.aggregator.UUID.deserializeBinaryFromReader);
+      var value = /** @type {string} */ (reader.readString());
       msg.setId(value);
       break;
     case 2:
@@ -5848,31 +6010,31 @@ proto.aggregator.Task.deserializeBinaryFromReader = function(msg, reader) {
       var value = /** @type {string} */ (reader.readString());
       msg.setSmartWalletAddress(value);
       break;
-    case 5:
+    case 4:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setStartAt(value);
       break;
-    case 6:
+    case 5:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setExpiredAt(value);
       break;
-    case 7:
+    case 6:
       var value = /** @type {string} */ (reader.readString());
       msg.setMemo(value);
       break;
-    case 8:
+    case 7:
       var value = /** @type {number} */ (reader.readInt64());
       msg.setCompletedAt(value);
       break;
-    case 10:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setRecurring(value);
+    case 8:
+      var value = /** @type {number} */ (reader.readInt64());
+      msg.setMaxExecution(value);
       break;
     case 9:
       var value = /** @type {!proto.aggregator.TaskStatus} */ (reader.readEnum());
       msg.setStatus(value);
       break;
-    case 4:
+    case 10:
       var value = new proto.aggregator.TaskTrigger;
       reader.readMessage(value,proto.aggregator.TaskTrigger.deserializeBinaryFromReader);
       msg.setTrigger(value);
@@ -5922,11 +6084,10 @@ proto.aggregator.Task.prototype.serializeBinary = function() {
 proto.aggregator.Task.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getId();
-  if (f != null) {
-    writer.writeMessage(
+  if (f.length > 0) {
+    writer.writeString(
       1,
-      f,
-      proto.aggregator.UUID.serializeBinaryToWriter
+      f
     );
   }
   f = message.getOwner();
@@ -5946,35 +6107,35 @@ proto.aggregator.Task.serializeBinaryToWriter = function(message, writer) {
   f = message.getStartAt();
   if (f !== 0) {
     writer.writeInt64(
-      5,
+      4,
       f
     );
   }
   f = message.getExpiredAt();
   if (f !== 0) {
     writer.writeInt64(
-      6,
+      5,
       f
     );
   }
   f = message.getMemo();
   if (f.length > 0) {
     writer.writeString(
-      7,
+      6,
       f
     );
   }
   f = message.getCompletedAt();
   if (f !== 0) {
     writer.writeInt64(
-      8,
+      7,
       f
     );
   }
-  f = message.getRecurring();
-  if (f) {
-    writer.writeBool(
-      10,
+  f = message.getMaxExecution();
+  if (f !== 0) {
+    writer.writeInt64(
+      8,
       f
     );
   }
@@ -5988,7 +6149,7 @@ proto.aggregator.Task.serializeBinaryToWriter = function(message, writer) {
   f = message.getTrigger();
   if (f != null) {
     writer.writeMessage(
-      4,
+      10,
       f,
       proto.aggregator.TaskTrigger.serializeBinaryToWriter
     );
@@ -6021,39 +6182,20 @@ proto.aggregator.Task.serializeBinaryToWriter = function(message, writer) {
 
 
 /**
- * optional UUID id = 1;
- * @return {?proto.aggregator.UUID}
+ * optional string id = 1;
+ * @return {string}
  */
 proto.aggregator.Task.prototype.getId = function() {
-  return /** @type{?proto.aggregator.UUID} */ (
-    jspb.Message.getWrapperField(this, proto.aggregator.UUID, 1));
-};
-
-
-/**
- * @param {?proto.aggregator.UUID|undefined} value
- * @return {!proto.aggregator.Task} returns this
-*/
-proto.aggregator.Task.prototype.setId = function(value) {
-  return jspb.Message.setWrapperField(this, 1, value);
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
- * Clears the message field making it undefined.
+ * @param {string} value
  * @return {!proto.aggregator.Task} returns this
  */
-proto.aggregator.Task.prototype.clearId = function() {
-  return this.setId(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.aggregator.Task.prototype.hasId = function() {
-  return jspb.Message.getField(this, 1) != null;
+proto.aggregator.Task.prototype.setId = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
 };
 
 
@@ -6094,11 +6236,11 @@ proto.aggregator.Task.prototype.setSmartWalletAddress = function(value) {
 
 
 /**
- * optional int64 start_at = 5;
+ * optional int64 start_at = 4;
  * @return {number}
  */
 proto.aggregator.Task.prototype.getStartAt = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
 };
 
 
@@ -6107,16 +6249,16 @@ proto.aggregator.Task.prototype.getStartAt = function() {
  * @return {!proto.aggregator.Task} returns this
  */
 proto.aggregator.Task.prototype.setStartAt = function(value) {
-  return jspb.Message.setProto3IntField(this, 5, value);
+  return jspb.Message.setProto3IntField(this, 4, value);
 };
 
 
 /**
- * optional int64 expired_at = 6;
+ * optional int64 expired_at = 5;
  * @return {number}
  */
 proto.aggregator.Task.prototype.getExpiredAt = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 6, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
 };
 
 
@@ -6125,16 +6267,16 @@ proto.aggregator.Task.prototype.getExpiredAt = function() {
  * @return {!proto.aggregator.Task} returns this
  */
 proto.aggregator.Task.prototype.setExpiredAt = function(value) {
-  return jspb.Message.setProto3IntField(this, 6, value);
+  return jspb.Message.setProto3IntField(this, 5, value);
 };
 
 
 /**
- * optional string memo = 7;
+ * optional string memo = 6;
  * @return {string}
  */
 proto.aggregator.Task.prototype.getMemo = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
 };
 
 
@@ -6143,16 +6285,16 @@ proto.aggregator.Task.prototype.getMemo = function() {
  * @return {!proto.aggregator.Task} returns this
  */
 proto.aggregator.Task.prototype.setMemo = function(value) {
-  return jspb.Message.setProto3StringField(this, 7, value);
+  return jspb.Message.setProto3StringField(this, 6, value);
 };
 
 
 /**
- * optional int64 completed_at = 8;
+ * optional int64 completed_at = 7;
  * @return {number}
  */
 proto.aggregator.Task.prototype.getCompletedAt = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 8, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 7, 0));
 };
 
 
@@ -6161,25 +6303,25 @@ proto.aggregator.Task.prototype.getCompletedAt = function() {
  * @return {!proto.aggregator.Task} returns this
  */
 proto.aggregator.Task.prototype.setCompletedAt = function(value) {
-  return jspb.Message.setProto3IntField(this, 8, value);
+  return jspb.Message.setProto3IntField(this, 7, value);
 };
 
 
 /**
- * optional bool recurring = 10;
- * @return {boolean}
+ * optional int64 max_execution = 8;
+ * @return {number}
  */
-proto.aggregator.Task.prototype.getRecurring = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 10, false));
+proto.aggregator.Task.prototype.getMaxExecution = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 8, 0));
 };
 
 
 /**
- * @param {boolean} value
+ * @param {number} value
  * @return {!proto.aggregator.Task} returns this
  */
-proto.aggregator.Task.prototype.setRecurring = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 10, value);
+proto.aggregator.Task.prototype.setMaxExecution = function(value) {
+  return jspb.Message.setProto3IntField(this, 8, value);
 };
 
 
@@ -6202,12 +6344,12 @@ proto.aggregator.Task.prototype.setStatus = function(value) {
 
 
 /**
- * optional TaskTrigger trigger = 4;
+ * optional TaskTrigger trigger = 10;
  * @return {?proto.aggregator.TaskTrigger}
  */
 proto.aggregator.Task.prototype.getTrigger = function() {
   return /** @type{?proto.aggregator.TaskTrigger} */ (
-    jspb.Message.getWrapperField(this, proto.aggregator.TaskTrigger, 4));
+    jspb.Message.getWrapperField(this, proto.aggregator.TaskTrigger, 10));
 };
 
 
@@ -6216,7 +6358,7 @@ proto.aggregator.Task.prototype.getTrigger = function() {
  * @return {!proto.aggregator.Task} returns this
 */
 proto.aggregator.Task.prototype.setTrigger = function(value) {
-  return jspb.Message.setWrapperField(this, 4, value);
+  return jspb.Message.setWrapperField(this, 10, value);
 };
 
 
@@ -6234,7 +6376,7 @@ proto.aggregator.Task.prototype.clearTrigger = function() {
  * @return {boolean}
  */
 proto.aggregator.Task.prototype.hasTrigger = function() {
-  return jspb.Message.getField(this, 4) != null;
+  return jspb.Message.getField(this, 10) != null;
 };
 
 
@@ -6394,7 +6536,7 @@ proto.aggregator.CreateTaskReq.toObject = function(includeInstance, msg) {
     trigger: (f = msg.getTrigger()) && proto.aggregator.TaskTrigger.toObject(includeInstance, f),
     startAt: jspb.Message.getFieldWithDefault(msg, 2, 0),
     expiredAt: jspb.Message.getFieldWithDefault(msg, 3, 0),
-    repeatable: jspb.Message.getBooleanFieldWithDefault(msg, 4, false),
+    maxExecution: jspb.Message.getFieldWithDefault(msg, 4, 0),
     smartWalletAddress: jspb.Message.getFieldWithDefault(msg, 5, ""),
     memo: jspb.Message.getFieldWithDefault(msg, 6, ""),
     nodesList: jspb.Message.toObjectList(msg.getNodesList(),
@@ -6451,8 +6593,8 @@ proto.aggregator.CreateTaskReq.deserializeBinaryFromReader = function(msg, reade
       msg.setExpiredAt(value);
       break;
     case 4:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setRepeatable(value);
+      var value = /** @type {number} */ (reader.readInt64());
+      msg.setMaxExecution(value);
       break;
     case 5:
       var value = /** @type {string} */ (reader.readString());
@@ -6523,9 +6665,9 @@ proto.aggregator.CreateTaskReq.serializeBinaryToWriter = function(message, write
       f
     );
   }
-  f = message.getRepeatable();
-  if (f) {
-    writer.writeBool(
+  f = message.getMaxExecution();
+  if (f !== 0) {
+    writer.writeInt64(
       4,
       f
     );
@@ -6637,20 +6779,20 @@ proto.aggregator.CreateTaskReq.prototype.setExpiredAt = function(value) {
 
 
 /**
- * optional bool repeatable = 4;
- * @return {boolean}
+ * optional int64 max_execution = 4;
+ * @return {number}
  */
-proto.aggregator.CreateTaskReq.prototype.getRepeatable = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 4, false));
+proto.aggregator.CreateTaskReq.prototype.getMaxExecution = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
 };
 
 
 /**
- * @param {boolean} value
+ * @param {number} value
  * @return {!proto.aggregator.CreateTaskReq} returns this
  */
-proto.aggregator.CreateTaskReq.prototype.setRepeatable = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 4, value);
+proto.aggregator.CreateTaskReq.prototype.setMaxExecution = function(value) {
+  return jspb.Message.setProto3IntField(this, 4, value);
 };
 
 
@@ -7172,8 +7314,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.aggregator.AddressRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.aggregator.AddressRequest.toObject(opt_includeInstance, this);
+proto.aggregator.ListWalletReq.prototype.toObject = function(opt_includeInstance) {
+  return proto.aggregator.ListWalletReq.toObject(opt_includeInstance, this);
 };
 
 
@@ -7182,11 +7324,11 @@ proto.aggregator.AddressRequest.prototype.toObject = function(opt_includeInstanc
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.aggregator.AddressRequest} msg The msg instance to transform.
+ * @param {!proto.aggregator.ListWalletReq} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.aggregator.AddressRequest.toObject = function(includeInstance, msg) {
+proto.aggregator.ListWalletReq.toObject = function(includeInstance, msg) {
   var f, obj = {
     factory: jspb.Message.getFieldWithDefault(msg, 1, ""),
     salt: jspb.Message.getFieldWithDefault(msg, 2, "")
@@ -7203,23 +7345,23 @@ proto.aggregator.AddressRequest.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.aggregator.AddressRequest}
+ * @return {!proto.aggregator.ListWalletReq}
  */
-proto.aggregator.AddressRequest.deserializeBinary = function(bytes) {
+proto.aggregator.ListWalletReq.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.aggregator.AddressRequest;
-  return proto.aggregator.AddressRequest.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.aggregator.ListWalletReq;
+  return proto.aggregator.ListWalletReq.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.aggregator.AddressRequest} msg The message object to deserialize into.
+ * @param {!proto.aggregator.ListWalletReq} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.aggregator.AddressRequest}
+ * @return {!proto.aggregator.ListWalletReq}
  */
-proto.aggregator.AddressRequest.deserializeBinaryFromReader = function(msg, reader) {
+proto.aggregator.ListWalletReq.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -7247,9 +7389,9 @@ proto.aggregator.AddressRequest.deserializeBinaryFromReader = function(msg, read
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.aggregator.AddressRequest.prototype.serializeBinary = function() {
+proto.aggregator.ListWalletReq.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.aggregator.AddressRequest.serializeBinaryToWriter(this, writer);
+  proto.aggregator.ListWalletReq.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -7257,11 +7399,11 @@ proto.aggregator.AddressRequest.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.aggregator.AddressRequest} message
+ * @param {!proto.aggregator.ListWalletReq} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.aggregator.AddressRequest.serializeBinaryToWriter = function(message, writer) {
+proto.aggregator.ListWalletReq.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getFactory();
   if (f.length > 0) {
@@ -7284,16 +7426,16 @@ proto.aggregator.AddressRequest.serializeBinaryToWriter = function(message, writ
  * optional string factory = 1;
  * @return {string}
  */
-proto.aggregator.AddressRequest.prototype.getFactory = function() {
+proto.aggregator.ListWalletReq.prototype.getFactory = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.aggregator.AddressRequest} returns this
+ * @return {!proto.aggregator.ListWalletReq} returns this
  */
-proto.aggregator.AddressRequest.prototype.setFactory = function(value) {
+proto.aggregator.ListWalletReq.prototype.setFactory = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 
@@ -7302,16 +7444,16 @@ proto.aggregator.AddressRequest.prototype.setFactory = function(value) {
  * optional string salt = 2;
  * @return {string}
  */
-proto.aggregator.AddressRequest.prototype.getSalt = function() {
+proto.aggregator.ListWalletReq.prototype.getSalt = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.aggregator.AddressRequest} returns this
+ * @return {!proto.aggregator.ListWalletReq} returns this
  */
-proto.aggregator.AddressRequest.prototype.setSalt = function(value) {
+proto.aggregator.ListWalletReq.prototype.setSalt = function(value) {
   return jspb.Message.setProto3StringField(this, 2, value);
 };
 
@@ -7512,7 +7654,7 @@ proto.aggregator.SmartWallet.prototype.setFactory = function(value) {
  * @private {!Array<number>}
  * @const
  */
-proto.aggregator.AddressResp.repeatedFields_ = [1];
+proto.aggregator.ListWalletResp.repeatedFields_ = [1];
 
 
 
@@ -7529,8 +7671,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.aggregator.AddressResp.prototype.toObject = function(opt_includeInstance) {
-  return proto.aggregator.AddressResp.toObject(opt_includeInstance, this);
+proto.aggregator.ListWalletResp.prototype.toObject = function(opt_includeInstance) {
+  return proto.aggregator.ListWalletResp.toObject(opt_includeInstance, this);
 };
 
 
@@ -7539,11 +7681,11 @@ proto.aggregator.AddressResp.prototype.toObject = function(opt_includeInstance)
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.aggregator.AddressResp} msg The msg instance to transform.
+ * @param {!proto.aggregator.ListWalletResp} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.aggregator.AddressResp.toObject = function(includeInstance, msg) {
+proto.aggregator.ListWalletResp.toObject = function(includeInstance, msg) {
   var f, obj = {
     walletsList: jspb.Message.toObjectList(msg.getWalletsList(),
     proto.aggregator.SmartWallet.toObject, includeInstance)
@@ -7560,23 +7702,23 @@ proto.aggregator.AddressResp.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.aggregator.AddressResp}
+ * @return {!proto.aggregator.ListWalletResp}
  */
-proto.aggregator.AddressResp.deserializeBinary = function(bytes) {
+proto.aggregator.ListWalletResp.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.aggregator.AddressResp;
-  return proto.aggregator.AddressResp.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.aggregator.ListWalletResp;
+  return proto.aggregator.ListWalletResp.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.aggregator.AddressResp} msg The message object to deserialize into.
+ * @param {!proto.aggregator.ListWalletResp} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.aggregator.AddressResp}
+ * @return {!proto.aggregator.ListWalletResp}
  */
-proto.aggregator.AddressResp.deserializeBinaryFromReader = function(msg, reader) {
+proto.aggregator.ListWalletResp.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -7601,9 +7743,9 @@ proto.aggregator.AddressResp.deserializeBinaryFromReader = function(msg, reader)
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.aggregator.AddressResp.prototype.serializeBinary = function() {
+proto.aggregator.ListWalletResp.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.aggregator.AddressResp.serializeBinaryToWriter(this, writer);
+  proto.aggregator.ListWalletResp.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -7611,11 +7753,11 @@ proto.aggregator.AddressResp.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.aggregator.AddressResp} message
+ * @param {!proto.aggregator.ListWalletResp} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.aggregator.AddressResp.serializeBinaryToWriter = function(message, writer) {
+proto.aggregator.ListWalletResp.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getWalletsList();
   if (f.length > 0) {
@@ -7632,7 +7774,7 @@ proto.aggregator.AddressResp.serializeBinaryToWriter = function(message, writer)
  * repeated SmartWallet wallets = 1;
  * @return {!Array<!proto.aggregator.SmartWallet>}
  */
-proto.aggregator.AddressResp.prototype.getWalletsList = function() {
+proto.aggregator.ListWalletResp.prototype.getWalletsList = function() {
   return /** @type{!Array<!proto.aggregator.SmartWallet>} */ (
     jspb.Message.getRepeatedWrapperField(this, proto.aggregator.SmartWallet, 1));
 };
@@ -7640,9 +7782,9 @@ proto.aggregator.AddressResp.prototype.getWalletsList = function() {
 
 /**
  * @param {!Array<!proto.aggregator.SmartWallet>} value
- * @return {!proto.aggregator.AddressResp} returns this
+ * @return {!proto.aggregator.ListWalletResp} returns this
 */
-proto.aggregator.AddressResp.prototype.setWalletsList = function(value) {
+proto.aggregator.ListWalletResp.prototype.setWalletsList = function(value) {
   return jspb.Message.setRepeatedWrapperField(this, 1, value);
 };
 
@@ -7652,16 +7794,16 @@ proto.aggregator.AddressResp.prototype.setWalletsList = function(value) {
  * @param {number=} opt_index
  * @return {!proto.aggregator.SmartWallet}
  */
-proto.aggregator.AddressResp.prototype.addWallets = function(opt_value, opt_index) {
+proto.aggregator.ListWalletResp.prototype.addWallets = function(opt_value, opt_index) {
   return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.aggregator.SmartWallet, opt_index);
 };
 
 
 /**
  * Clears the list making it empty but non-null.
- * @return {!proto.aggregator.AddressResp} returns this
+ * @return {!proto.aggregator.ListWalletResp} returns this
  */
-proto.aggregator.AddressResp.prototype.clearWalletsList = function() {
+proto.aggregator.ListWalletResp.prototype.clearWalletsList = function() {
   return this.setWalletsList([]);
 };
 
@@ -8835,7 +8977,9 @@ proto.aggregator.CreateWalletResp.prototype.toObject = function(opt_includeInsta
  */
 proto.aggregator.CreateWalletResp.toObject = function(includeInstance, msg) {
   var f, obj = {
-    address: jspb.Message.getFieldWithDefault(msg, 1, "")
+    address: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    salt: jspb.Message.getFieldWithDefault(msg, 2, ""),
+    factoryAddress: jspb.Message.getFieldWithDefault(msg, 3, "")
   };
 
   if (includeInstance) {
@@ -8876,6 +9020,14 @@ proto.aggregator.CreateWalletResp.deserializeBinaryFromReader = function(msg, re
       var value = /** @type {string} */ (reader.readString());
       msg.setAddress(value);
       break;
+    case 2:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setSalt(value);
+      break;
+    case 3:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setFactoryAddress(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -8912,6 +9064,20 @@ proto.aggregator.CreateWalletResp.serializeBinaryToWriter = function(message, wr
       f
     );
   }
+  f = message.getSalt();
+  if (f.length > 0) {
+    writer.writeString(
+      2,
+      f
+    );
+  }
+  f = message.getFactoryAddress();
+  if (f.length > 0) {
+    writer.writeString(
+      3,
+      f
+    );
+  }
 };
 
 
@@ -8934,16 +9100,41 @@ proto.aggregator.CreateWalletResp.prototype.setAddress = function(value) {
 
 
 /**
- * @enum {number}
+ * optional string salt = 2;
+ * @return {string}
+ */
+proto.aggregator.CreateWalletResp.prototype.getSalt = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.aggregator.CreateWalletResp} returns this
+ */
+proto.aggregator.CreateWalletResp.prototype.setSalt = function(value) {
+  return jspb.Message.setProto3StringField(this, 2, value);
+};
+
+
+/**
+ * optional string factory_address = 3;
+ * @return {string}
+ */
+proto.aggregator.CreateWalletResp.prototype.getFactoryAddress = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.aggregator.CreateWalletResp} returns this
  */
-proto.aggregator.TriggerType = {
-  MANUALTRIGGER: 0,
-  FIXEDEPOCHTRIGGER: 1,
-  CRONTRIGGER: 2,
-  BLOCKTRIGGER: 3,
-  EVENTTRIGGER: 4
+proto.aggregator.CreateWalletResp.prototype.setFactoryAddress = function(value) {
+  return jspb.Message.setProto3StringField(this, 3, value);
 };
 
+
 /**
  * @enum {number}
  */
@@ -8976,18 +9167,4 @@ proto.aggregator.CustomCodeType = {
   JAVASCRIPT: 0
 };
 
-/**
- * @enum {number}
- */
-proto.aggregator.TaskType = {
-  ETHTRANSFERTASK: 0,
-  CONTRACTWRITETASK: 1,
-  CONTRACTREADTASK: 2,
-  GRAPHQLDATAQUERYTASK: 3,
-  RESTAPITASK: 4,
-  BRANCHTASK: 5,
-  FILTERTASK: 6,
-  CUSTOMCODETASK: 7
-};
-
 goog.object.extend(exports, proto.aggregator);
diff --git a/protobuf/avs.pb.go b/protobuf/avs.pb.go
index 5259fb2..2a58a67 100644
--- a/protobuf/avs.pb.go
+++ b/protobuf/avs.pb.go
@@ -22,61 +22,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-type TriggerType int32
-
-const (
-	TriggerType_ManualTrigger     TriggerType = 0
-	TriggerType_FixedEpochTrigger TriggerType = 1
-	TriggerType_CronTrigger       TriggerType = 2
-	TriggerType_BlockTrigger      TriggerType = 3
-	TriggerType_EventTrigger      TriggerType = 4
-)
-
-// Enum value maps for TriggerType.
-var (
-	TriggerType_name = map[int32]string{
-		0: "ManualTrigger",
-		1: "FixedEpochTrigger",
-		2: "CronTrigger",
-		3: "BlockTrigger",
-		4: "EventTrigger",
-	}
-	TriggerType_value = map[string]int32{
-		"ManualTrigger":     0,
-		"FixedEpochTrigger": 1,
-		"CronTrigger":       2,
-		"BlockTrigger":      3,
-		"EventTrigger":      4,
-	}
-)
-
-func (x TriggerType) Enum() *TriggerType {
-	p := new(TriggerType)
-	*p = x
-	return p
-}
-
-func (x TriggerType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (TriggerType) Descriptor() protoreflect.EnumDescriptor {
-	return file_protobuf_avs_proto_enumTypes[0].Descriptor()
-}
-
-func (TriggerType) Type() protoreflect.EnumType {
-	return &file_protobuf_avs_proto_enumTypes[0]
-}
-
-func (x TriggerType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use TriggerType.Descriptor instead.
-func (TriggerType) EnumDescriptor() ([]byte, []int) {
-	return file_protobuf_avs_proto_rawDescGZIP(), []int{0}
-}
-
 // gRPC internal error code use up to 17, we extend and start from 1000 to avoid any conflict
 // Guide: https://grpc.io/docs/guides/error/
 // Go: https://github.com/grpc/grpc-go/blob/master/codes/codes.go#L199
@@ -133,11 +78,11 @@ func (x Error) String() string {
 }
 
 func (Error) Descriptor() protoreflect.EnumDescriptor {
-	return file_protobuf_avs_proto_enumTypes[1].Descriptor()
+	return file_protobuf_avs_proto_enumTypes[0].Descriptor()
 }
 
 func (Error) Type() protoreflect.EnumType {
-	return &file_protobuf_avs_proto_enumTypes[1]
+	return &file_protobuf_avs_proto_enumTypes[0]
 }
 
 func (x Error) Number() protoreflect.EnumNumber {
@@ -146,7 +91,7 @@ func (x Error) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use Error.Descriptor instead.
 func (Error) EnumDescriptor() ([]byte, []int) {
-	return file_protobuf_avs_proto_rawDescGZIP(), []int{1}
+	return file_protobuf_avs_proto_rawDescGZIP(), []int{0}
 }
 
 // TaskStatus represents status of the task. The transition is as follow
@@ -189,11 +134,11 @@ func (x TaskStatus) String() string {
 }
 
 func (TaskStatus) Descriptor() protoreflect.EnumDescriptor {
-	return file_protobuf_avs_proto_enumTypes[2].Descriptor()
+	return file_protobuf_avs_proto_enumTypes[1].Descriptor()
 }
 
 func (TaskStatus) Type() protoreflect.EnumType {
-	return &file_protobuf_avs_proto_enumTypes[2]
+	return &file_protobuf_avs_proto_enumTypes[1]
 }
 
 func (x TaskStatus) Number() protoreflect.EnumNumber {
@@ -202,7 +147,7 @@ func (x TaskStatus) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use TaskStatus.Descriptor instead.
 func (TaskStatus) EnumDescriptor() ([]byte, []int) {
-	return file_protobuf_avs_proto_rawDescGZIP(), []int{2}
+	return file_protobuf_avs_proto_rawDescGZIP(), []int{1}
 }
 
 type CustomCodeType int32
@@ -232,11 +177,11 @@ func (x CustomCodeType) String() string {
 }
 
 func (CustomCodeType) Descriptor() protoreflect.EnumDescriptor {
-	return file_protobuf_avs_proto_enumTypes[3].Descriptor()
+	return file_protobuf_avs_proto_enumTypes[2].Descriptor()
 }
 
 func (CustomCodeType) Type() protoreflect.EnumType {
-	return &file_protobuf_avs_proto_enumTypes[3]
+	return &file_protobuf_avs_proto_enumTypes[2]
 }
 
 func (x CustomCodeType) Number() protoreflect.EnumNumber {
@@ -245,7 +190,7 @@ func (x CustomCodeType) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use CustomCodeType.Descriptor instead.
 func (CustomCodeType) EnumDescriptor() ([]byte, []int) {
-	return file_protobuf_avs_proto_rawDescGZIP(), []int{3}
+	return file_protobuf_avs_proto_rawDescGZIP(), []int{2}
 }
 
 type IdReq struct {
@@ -513,7 +458,7 @@ type FixedEpochCondition struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Epoches []int64 `protobuf:"varint,1,rep,packed,name=epoches,proto3" json:"epoches,omitempty"`
+	Epochs []int64 `protobuf:"varint,1,rep,packed,name=epochs,proto3" json:"epochs,omitempty"`
 }
 
 func (x *FixedEpochCondition) Reset() {
@@ -548,9 +493,9 @@ func (*FixedEpochCondition) Descriptor() ([]byte, []int) {
 	return file_protobuf_avs_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *FixedEpochCondition) GetEpoches() []int64 {
+func (x *FixedEpochCondition) GetEpochs() []int64 {
 	if x != nil {
-		return x.Epoches
+		return x.Epochs
 	}
 	return nil
 }
@@ -561,7 +506,7 @@ type CronCondition struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	CronTable []string `protobuf:"bytes,1,rep,name=cron_table,json=cronTable,proto3" json:"cron_table,omitempty"`
+	Schedule []string `protobuf:"bytes,1,rep,name=schedule,proto3" json:"schedule,omitempty"`
 }
 
 func (x *CronCondition) Reset() {
@@ -596,9 +541,9 @@ func (*CronCondition) Descriptor() ([]byte, []int) {
 	return file_protobuf_avs_proto_rawDescGZIP(), []int{5}
 }
 
-func (x *CronCondition) GetCronTable() []string {
+func (x *CronCondition) GetSchedule() []string {
 	if x != nil {
-		return x.CronTable
+		return x.Schedule
 	}
 	return nil
 }
@@ -717,7 +662,7 @@ type TaskTrigger struct {
 	// Types that are assignable to TriggerType:
 	//
 	//	*TaskTrigger_Manual
-	//	*TaskTrigger_At
+	//	*TaskTrigger_FixedTime
 	//	*TaskTrigger_Cron
 	//	*TaskTrigger_Block
 	//	*TaskTrigger_Event
@@ -770,9 +715,9 @@ func (x *TaskTrigger) GetManual() bool {
 	return false
 }
 
-func (x *TaskTrigger) GetAt() *FixedEpochCondition {
-	if x, ok := x.GetTriggerType().(*TaskTrigger_At); ok {
-		return x.At
+func (x *TaskTrigger) GetFixedTime() *FixedEpochCondition {
+	if x, ok := x.GetTriggerType().(*TaskTrigger_FixedTime); ok {
+		return x.FixedTime
 	}
 	return nil
 }
@@ -803,32 +748,32 @@ type isTaskTrigger_TriggerType interface {
 }
 
 type TaskTrigger_Manual struct {
-	Manual bool `protobuf:"varint,2,opt,name=manual,proto3,oneof"`
+	Manual bool `protobuf:"varint,1,opt,name=manual,proto3,oneof"`
 }
 
-type TaskTrigger_At struct {
+type TaskTrigger_FixedTime struct {
 	// run at a specific epoch, name inspired by unix `at` utility
-	At *FixedEpochCondition `protobuf:"bytes,3,opt,name=at,proto3,oneof"`
+	FixedTime *FixedEpochCondition `protobuf:"bytes,2,opt,name=fixed_time,json=fixedTime,proto3,oneof"`
 }
 
 type TaskTrigger_Cron struct {
 	// interval such as every hour/day/ etc can be converted to cronsyntax by the sdk/studio
-	Cron *CronCondition `protobuf:"bytes,4,opt,name=cron,proto3,oneof"`
+	Cron *CronCondition `protobuf:"bytes,3,opt,name=cron,proto3,oneof"`
 }
 
 type TaskTrigger_Block struct {
 	// currently the only support syntax is every <x> blocks
-	Block *BlockCondition `protobuf:"bytes,5,opt,name=block,proto3,oneof"`
+	Block *BlockCondition `protobuf:"bytes,4,opt,name=block,proto3,oneof"`
 }
 
 type TaskTrigger_Event struct {
 	// support filter by event expression such as topic0, topic1, topoc2 and event_data and contract_address
-	Event *EventCondition `protobuf:"bytes,6,opt,name=event,proto3,oneof"`
+	Event *EventCondition `protobuf:"bytes,5,opt,name=event,proto3,oneof"`
 }
 
 func (*TaskTrigger_Manual) isTaskTrigger_TriggerType() {}
 
-func (*TaskTrigger_At) isTaskTrigger_TriggerType() {}
+func (*TaskTrigger_FixedTime) isTaskTrigger_TriggerType() {}
 
 func (*TaskTrigger_Cron) isTaskTrigger_TriggerType() {}
 
@@ -1429,6 +1374,7 @@ func (x *FilterNode) GetExpression() string {
 	return ""
 }
 
+// LoopNode currently not support, but we pre-defined to reverse the field id
 type LoopNode struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1437,10 +1383,6 @@ type LoopNode struct {
 	// name the iteration key and value.
 	IterVar string `protobuf:"bytes,1,opt,name=iter_var,json=iterVar,proto3" json:"iter_var,omitempty"`
 	IterKey string `protobuf:"bytes,2,opt,name=iter_key,json=iterKey,proto3" json:"iter_key,omitempty"`
-	// func can be the built-in function
-	IterFunc string `protobuf:"bytes,3,opt,name=iter_func,json=iterFunc,proto3" json:"iter_func,omitempty"`
-	// jj
-	IterNode string `protobuf:"bytes,4,opt,name=iter_node,json=iterNode,proto3" json:"iter_node,omitempty"`
 }
 
 func (x *LoopNode) Reset() {
@@ -1489,20 +1431,6 @@ func (x *LoopNode) GetIterKey() string {
 	return ""
 }
 
-func (x *LoopNode) GetIterFunc() string {
-	if x != nil {
-		return x.IterFunc
-	}
-	return ""
-}
-
-func (x *LoopNode) GetIterNode() string {
-	if x != nil {
-		return x.IterNode
-	}
-	return ""
-}
-
 // The edge is relationship or direct between node
 type TaskEdge struct {
 	state         protoimpl.MessageState
@@ -1843,16 +1771,16 @@ type Task struct {
 	Owner              string `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty"`
 	SmartWalletAddress string `protobuf:"bytes,3,opt,name=smart_wallet_address,json=smartWalletAddress,proto3" json:"smart_wallet_address,omitempty"`
 	// task won't be check before this
-	StartAt int64 `protobuf:"varint,5,opt,name=start_at,json=startAt,proto3" json:"start_at,omitempty"`
+	StartAt int64 `protobuf:"varint,4,opt,name=start_at,json=startAt,proto3" json:"start_at,omitempty"`
 	// task won't be run/check after this
-	ExpiredAt int64 `protobuf:"varint,6,opt,name=expired_at,json=expiredAt,proto3" json:"expired_at,omitempty"`
+	ExpiredAt int64 `protobuf:"varint,5,opt,name=expired_at,json=expiredAt,proto3" json:"expired_at,omitempty"`
 	// arbitrary data about this task. has a limit of 255 character
-	Memo        string `protobuf:"bytes,7,opt,name=memo,proto3" json:"memo,omitempty"`
-	CompletedAt int64  `protobuf:"varint,8,opt,name=completed_at,json=completedAt,proto3" json:"completed_at,omitempty"`
+	Memo        string `protobuf:"bytes,6,opt,name=memo,proto3" json:"memo,omitempty"`
+	CompletedAt int64  `protobuf:"varint,7,opt,name=completed_at,json=completedAt,proto3" json:"completed_at,omitempty"`
 	// limit on how many time this task can run. Set to 0 will make it run unlimited until cancelling or reaching its expired time
-	MaxExecution int64        `protobuf:"varint,10,opt,name=max_execution,json=maxExecution,proto3" json:"max_execution,omitempty"`
+	MaxExecution int64        `protobuf:"varint,8,opt,name=max_execution,json=maxExecution,proto3" json:"max_execution,omitempty"`
 	Status       TaskStatus   `protobuf:"varint,9,opt,name=status,proto3,enum=aggregator.TaskStatus" json:"status,omitempty"`
-	Trigger      *TaskTrigger `protobuf:"bytes,4,opt,name=trigger,proto3" json:"trigger,omitempty"`
+	Trigger      *TaskTrigger `protobuf:"bytes,10,opt,name=trigger,proto3" json:"trigger,omitempty"`
 	Nodes        []*TaskNode  `protobuf:"bytes,11,rep,name=nodes,proto3" json:"nodes,omitempty"`
 	Edges        []*TaskEdge  `protobuf:"bytes,12,rep,name=edges,proto3" json:"edges,omitempty"`
 	Executions   []*Execution `protobuf:"bytes,13,rep,name=executions,proto3" json:"executions,omitempty"`
@@ -1986,11 +1914,10 @@ type CreateTaskReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Trigger   *TaskTrigger `protobuf:"bytes,1,opt,name=trigger,proto3" json:"trigger,omitempty"`
-	StartAt   int64        `protobuf:"varint,2,opt,name=start_at,json=startAt,proto3" json:"start_at,omitempty"`
-	ExpiredAt int64        `protobuf:"varint,3,opt,name=expired_at,json=expiredAt,proto3" json:"expired_at,omitempty"`
-	// A repeatable task will continue to be run
-	Repeatable bool `protobuf:"varint,4,opt,name=repeatable,proto3" json:"repeatable,omitempty"`
+	Trigger      *TaskTrigger `protobuf:"bytes,1,opt,name=trigger,proto3" json:"trigger,omitempty"`
+	StartAt      int64        `protobuf:"varint,2,opt,name=start_at,json=startAt,proto3" json:"start_at,omitempty"`
+	ExpiredAt    int64        `protobuf:"varint,3,opt,name=expired_at,json=expiredAt,proto3" json:"expired_at,omitempty"`
+	MaxExecution int64        `protobuf:"varint,4,opt,name=max_execution,json=maxExecution,proto3" json:"max_execution,omitempty"`
 	// the smart wallet address that will be used to run this task
 	// When leaving out, we will use the default(salt=0) wallet
 	SmartWalletAddress string      `protobuf:"bytes,5,opt,name=smart_wallet_address,json=smartWalletAddress,proto3" json:"smart_wallet_address,omitempty"`
@@ -2052,11 +1979,11 @@ func (x *CreateTaskReq) GetExpiredAt() int64 {
 	return 0
 }
 
-func (x *CreateTaskReq) GetRepeatable() bool {
+func (x *CreateTaskReq) GetMaxExecution() int64 {
 	if x != nil {
-		return x.Repeatable
+		return x.MaxExecution
 	}
-	return false
+	return 0
 }
 
 func (x *CreateTaskReq) GetSmartWalletAddress() string {
@@ -2937,114 +2864,111 @@ var file_protobuf_avs_proto_rawDesc = []byte{
 	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75,
 	0x72, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x6d, 0x6f, 0x6e, 0x6f, 0x74, 0x6f, 0x6e, 0x69, 0x63, 0x5f,
 	0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x6d, 0x6f, 0x6e,
-	0x6f, 0x74, 0x6f, 0x6e, 0x69, 0x63, 0x43, 0x6c, 0x6f, 0x63, 0x6b, 0x22, 0x2f, 0x0a, 0x13, 0x46,
+	0x6f, 0x74, 0x6f, 0x6e, 0x69, 0x63, 0x43, 0x6c, 0x6f, 0x63, 0x6b, 0x22, 0x2d, 0x0a, 0x13, 0x46,
 	0x69, 0x78, 0x65, 0x64, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x65, 0x73, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x03, 0x52, 0x07, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x65, 0x73, 0x22, 0x2e, 0x0a, 0x0d,
-	0x43, 0x72, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1d, 0x0a,
-	0x0a, 0x63, 0x72, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x09, 0x63, 0x72, 0x6f, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x2c, 0x0a, 0x0e,
-	0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a,
-	0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x22, 0x30, 0x0a, 0x0e, 0x45, 0x76,
-	0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a,
-	0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x83, 0x02, 0x0a,
-	0x0b, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x06,
-	0x6d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x06,
-	0x6d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x12, 0x31, 0x0a, 0x02, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e,
-	0x46, 0x69, 0x78, 0x65, 0x64, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x02, 0x61, 0x74, 0x12, 0x2f, 0x0a, 0x04, 0x63, 0x72, 0x6f,
-	0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67,
-	0x61, 0x74, 0x6f, 0x72, 0x2e, 0x43, 0x72, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x48, 0x00, 0x52, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x12, 0x32, 0x0a, 0x05, 0x62, 0x6c,
-	0x6f, 0x63, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x61, 0x67, 0x67, 0x72,
-	0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x43, 0x6f, 0x6e, 0x64,
-	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x32,
-	0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
-	0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74,
-	0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x05, 0x65, 0x76, 0x65,
-	0x6e, 0x74, 0x42, 0x0e, 0x0a, 0x0c, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x74, 0x79,
-	0x70, 0x65, 0x22, 0x70, 0x0a, 0x0d, 0x53, 0x79, 0x6e, 0x63, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x02, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x79, 0x70, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x79, 0x70,
-	0x65, 0x12, 0x31, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e,
-	0x54, 0x61, 0x73, 0x6b, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x07, 0x74, 0x72, 0x69,
-	0x67, 0x67, 0x65, 0x72, 0x22, 0x4b, 0x0a, 0x0f, 0x45, 0x54, 0x48, 0x54, 0x72, 0x61, 0x6e, 0x73,
-	0x66, 0x65, 0x72, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x74, 0x69,
-	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65,
-	0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f,
-	0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e,
-	0x74, 0x22, 0x7e, 0x0a, 0x11, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x57, 0x72, 0x69,
-	0x74, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x29, 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61,
-	0x63, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
-	0x73, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x61, 0x6c, 0x6c, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x61, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x21,
-	0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f, 0x61, 0x62, 0x69, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x41, 0x62,
-	0x69, 0x22, 0x7d, 0x0a, 0x10, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x61,
-	0x64, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x29, 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
-	0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-	0x12, 0x1b, 0x0a, 0x09, 0x63, 0x61, 0x6c, 0x6c, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x61, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x21, 0x0a,
-	0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f, 0x61, 0x62, 0x69, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x41, 0x62, 0x69,
-	0x22, 0xc3, 0x01, 0x0a, 0x10, 0x47, 0x72, 0x61, 0x70, 0x68, 0x51, 0x4c, 0x51, 0x75, 0x65, 0x72,
-	0x79, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x49, 0x0a,
-	0x09, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x2b, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x47, 0x72,
-	0x61, 0x70, 0x68, 0x51, 0x4c, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4e, 0x6f, 0x64, 0x65, 0x2e, 0x56,
-	0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x76,
-	0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x1a, 0x3c, 0x0a, 0x0e, 0x56, 0x61, 0x72, 0x69,
-	0x61, 0x62, 0x6c, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
-	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xc7, 0x01, 0x0a, 0x0b, 0x52, 0x65, 0x73, 0x74, 0x41,
-	0x50, 0x49, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x3e, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x61, 0x67, 0x67, 0x72,
-	0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x74, 0x41, 0x50, 0x49, 0x4e, 0x6f,
-	0x64, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x16, 0x0a, 0x06,
-	0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65,
-	0x74, 0x68, 0x6f, 0x64, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x45,
+	0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x73, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x03, 0x52, 0x06, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x73, 0x22, 0x2b, 0x0a, 0x0d, 0x43, 0x72,
+	0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x73,
+	0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x73,
+	0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x22, 0x2c, 0x0a, 0x0e, 0x42, 0x6c, 0x6f, 0x63, 0x6b,
+	0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x76, 0x61, 0x6c, 0x22, 0x30, 0x0a, 0x0e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x43, 0x6f,
+	0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65,
+	0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x78, 0x70,
+	0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x92, 0x02, 0x0a, 0x0b, 0x54, 0x61, 0x73, 0x6b,
+	0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x06, 0x6d, 0x61, 0x6e, 0x75, 0x61,
+	0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x06, 0x6d, 0x61, 0x6e, 0x75, 0x61,
+	0x6c, 0x12, 0x40, 0x0a, 0x0a, 0x66, 0x69, 0x78, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74,
+	0x6f, 0x72, 0x2e, 0x46, 0x69, 0x78, 0x65, 0x64, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x43, 0x6f, 0x6e,
+	0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x09, 0x66, 0x69, 0x78, 0x65, 0x64, 0x54,
+	0x69, 0x6d, 0x65, 0x12, 0x2f, 0x0a, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x19, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x43,
+	0x72, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x04,
+	0x63, 0x72, 0x6f, 0x6e, 0x12, 0x32, 0x0a, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72,
+	0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48,
+	0x00, 0x52, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x32, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e,
+	0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67,
+	0x61, 0x74, 0x6f, 0x72, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74,
+	0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x0e, 0x0a, 0x0c,
+	0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x70, 0x0a, 0x0d,
+	0x53, 0x79, 0x6e, 0x63, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0e, 0x0a,
+	0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1c, 0x0a,
+	0x09, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x09, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x31, 0x0a, 0x07, 0x74,
+	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61,
+	0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x72,
+	0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x22, 0x4b,
+	0x0a, 0x0f, 0x45, 0x54, 0x48, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x4e, 0x6f, 0x64,
+	0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x7e, 0x0a, 0x11, 0x43,
+	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x57, 0x72, 0x69, 0x74, 0x65, 0x4e, 0x6f, 0x64, 0x65,
+	0x12, 0x29, 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f, 0x61, 0x64, 0x64,
+	0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x74,
+	0x72, 0x61, 0x63, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x63,
+	0x61, 0x6c, 0x6c, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x63, 0x61, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x74,
+	0x72, 0x61, 0x63, 0x74, 0x5f, 0x61, 0x62, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x41, 0x62, 0x69, 0x22, 0x7d, 0x0a, 0x10, 0x43,
+	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x61, 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x12,
+	0x29, 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x72,
+	0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x61, 0x63, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x61,
+	0x6c, 0x6c, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63,
+	0x61, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x61, 0x63, 0x74, 0x5f, 0x61, 0x62, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63,
+	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x41, 0x62, 0x69, 0x22, 0xc3, 0x01, 0x0a, 0x10, 0x47,
+	0x72, 0x61, 0x70, 0x68, 0x51, 0x4c, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4e, 0x6f, 0x64, 0x65, 0x12,
+	0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72,
+	0x6c, 0x12, 0x14, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x49, 0x0a, 0x09, 0x76, 0x61, 0x72, 0x69, 0x61,
+	0x62, 0x6c, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x61, 0x67, 0x67,
+	0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x51, 0x4c, 0x51,
+	0x75, 0x65, 0x72, 0x79, 0x4e, 0x6f, 0x64, 0x65, 0x2e, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c,
+	0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c,
+	0x65, 0x73, 0x1a, 0x3c, 0x0a, 0x0e, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x45,
 	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
 	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x22, 0x58, 0x0a, 0x0e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6f, 0x64, 0x65, 0x4e, 0x6f,
-	0x64, 0x65, 0x12, 0x2e, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x1a, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x43, 0x75,
-	0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6f, 0x64, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79,
-	0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x4f, 0x0a, 0x09, 0x43, 0x6f,
-	0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x65,
-	0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x43, 0x0a, 0x0a, 0x42,
-	0x72, 0x61, 0x6e, 0x63, 0x68, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x35, 0x0a, 0x0a, 0x63, 0x6f, 0x6e,
-	0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e,
-	0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x22, 0x2c, 0x0a, 0x0a, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x1e,
-	0x0a, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x7a,
-	0x0a, 0x08, 0x4c, 0x6f, 0x6f, 0x70, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x69, 0x74,
-	0x65, 0x72, 0x5f, 0x76, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x69, 0x74,
-	0x65, 0x72, 0x56, 0x61, 0x72, 0x12, 0x19, 0x0a, 0x08, 0x69, 0x74, 0x65, 0x72, 0x5f, 0x6b, 0x65,
-	0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x69, 0x74, 0x65, 0x72, 0x4b, 0x65, 0x79,
-	0x12, 0x1b, 0x0a, 0x09, 0x69, 0x74, 0x65, 0x72, 0x5f, 0x66, 0x75, 0x6e, 0x63, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x08, 0x69, 0x74, 0x65, 0x72, 0x46, 0x75, 0x6e, 0x63, 0x12, 0x1b, 0x0a,
-	0x09, 0x69, 0x74, 0x65, 0x72, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x69, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x64, 0x65, 0x22, 0x4a, 0x0a, 0x08, 0x54, 0x61,
+	0x22, 0xc7, 0x01, 0x0a, 0x0b, 0x52, 0x65, 0x73, 0x74, 0x41, 0x50, 0x49, 0x4e, 0x6f, 0x64, 0x65,
+	0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
+	0x72, 0x6c, 0x12, 0x3e, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72,
+	0x2e, 0x52, 0x65, 0x73, 0x74, 0x41, 0x50, 0x49, 0x4e, 0x6f, 0x64, 0x65, 0x2e, 0x48, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65,
+	0x72, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x1a, 0x3a,
+	0x0a, 0x0c, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
+	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
+	0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x58, 0x0a, 0x0e, 0x43, 0x75,
+	0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6f, 0x64, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x2e, 0x0a, 0x04,
+	0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1a, 0x2e, 0x61, 0x67, 0x67,
+	0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6f,
+	0x64, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x22, 0x4f, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
+	0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73,
+	0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65,
+	0x73, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x43, 0x0a, 0x0a, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x4e,
+	0x6f, 0x64, 0x65, 0x12, 0x35, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67,
+	0x61, 0x74, 0x6f, 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a,
+	0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x0a, 0x46, 0x69,
+	0x6c, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x72,
+	0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x78,
+	0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x40, 0x0a, 0x08, 0x4c, 0x6f, 0x6f, 0x70,
+	0x4e, 0x6f, 0x64, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x69, 0x74, 0x65, 0x72, 0x5f, 0x76, 0x61, 0x72,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x69, 0x74, 0x65, 0x72, 0x56, 0x61, 0x72, 0x12,
+	0x19, 0x0a, 0x08, 0x69, 0x74, 0x65, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x07, 0x69, 0x74, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x22, 0x4a, 0x0a, 0x08, 0x54, 0x61,
 	0x73, 0x6b, 0x45, 0x64, 0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
 	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x16,
@@ -3099,20 +3023,20 @@ var file_protobuf_avs_proto_rawDesc = []byte{
 	0x12, 0x30, 0x0a, 0x14, 0x73, 0x6d, 0x61, 0x72, 0x74, 0x5f, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74,
 	0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12,
 	0x73, 0x6d, 0x61, 0x72, 0x74, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65,
-	0x73, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x61, 0x74, 0x18, 0x05,
+	0x73, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x61, 0x74, 0x18, 0x04,
 	0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x73, 0x74, 0x61, 0x72, 0x74, 0x41, 0x74, 0x12, 0x1d, 0x0a,
-	0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28,
 	0x03, 0x52, 0x09, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x41, 0x74, 0x12, 0x12, 0x0a, 0x04,
-	0x6d, 0x65, 0x6d, 0x6f, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6d, 0x65, 0x6d, 0x6f,
+	0x6d, 0x65, 0x6d, 0x6f, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6d, 0x65, 0x6d, 0x6f,
 	0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74,
-	0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
 	0x64, 0x41, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x6d, 0x61, 0x78, 0x5f, 0x65, 0x78, 0x65, 0x63, 0x75,
-	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x6d, 0x61, 0x78, 0x45,
+	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x6d, 0x61, 0x78, 0x45,
 	0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2e, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74,
 	0x75, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65,
 	0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
 	0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x31, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x67,
-	0x67, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61, 0x67, 0x67, 0x72,
+	0x67, 0x65, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61, 0x67, 0x67, 0x72,
 	0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x72, 0x69, 0x67, 0x67,
 	0x65, 0x72, 0x52, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x12, 0x2a, 0x0a, 0x05, 0x6e,
 	0x6f, 0x64, 0x65, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x61, 0x67, 0x67,
@@ -3123,7 +3047,7 @@ var file_protobuf_avs_proto_rawDesc = []byte{
 	0x67, 0x65, 0x73, 0x12, 0x35, 0x0a, 0x0a, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e,
 	0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67,
 	0x61, 0x74, 0x6f, 0x72, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a,
-	0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xba, 0x02, 0x0a, 0x0d, 0x43,
+	0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xbf, 0x02, 0x0a, 0x0d, 0x43,
 	0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x31, 0x0a, 0x07,
 	0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e,
 	0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x54,
@@ -3131,155 +3055,149 @@ var file_protobuf_avs_proto_rawDesc = []byte{
 	0x19, 0x0a, 0x08, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
 	0x03, 0x52, 0x07, 0x73, 0x74, 0x61, 0x72, 0x74, 0x41, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x78,
 	0x70, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09,
-	0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x70,
-	0x65, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x72,
-	0x65, 0x70, 0x65, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x30, 0x0a, 0x14, 0x73, 0x6d, 0x61,
-	0x72, 0x74, 0x5f, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73,
-	0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x73, 0x6d, 0x61, 0x72, 0x74, 0x57, 0x61,
-	0x6c, 0x6c, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x6d,
-	0x65, 0x6d, 0x6f, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x12,
-	0x2a, 0x0a, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14,
-	0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x54, 0x61, 0x73, 0x6b,
-	0x4e, 0x6f, 0x64, 0x65, 0x52, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x65,
-	0x64, 0x67, 0x65, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x61, 0x67, 0x67,
-	0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x64, 0x67, 0x65,
-	0x52, 0x05, 0x65, 0x64, 0x67, 0x65, 0x73, 0x22, 0x20, 0x0a, 0x0e, 0x43, 0x72, 0x65, 0x61, 0x74,
-	0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x24, 0x0a, 0x0c, 0x4e, 0x6f, 0x6e,
-	0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x77, 0x6e,
-	0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x22,
-	0x21, 0x0a, 0x09, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05,
-	0x6e, 0x6f, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6e, 0x6f, 0x6e,
-	0x63, 0x65, 0x22, 0x3d, 0x0a, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74,
-	0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x12, 0x0a,
-	0x04, 0x73, 0x61, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x61, 0x6c,
-	0x74, 0x22, 0x55, 0x0a, 0x0b, 0x53, 0x6d, 0x61, 0x72, 0x74, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74,
-	0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x61,
-	0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x61, 0x6c, 0x74, 0x12, 0x18,
-	0x0a, 0x07, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x07, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x22, 0x43, 0x0a, 0x0e, 0x4c, 0x69, 0x73, 0x74,
-	0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x31, 0x0a, 0x07, 0x77, 0x61,
-	0x6c, 0x6c, 0x65, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61, 0x67,
-	0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x53, 0x6d, 0x61, 0x72, 0x74, 0x57, 0x61,
-	0x6c, 0x6c, 0x65, 0x74, 0x52, 0x07, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x73, 0x22, 0x40, 0x0a,
-	0x0c, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x71, 0x12, 0x30, 0x0a,
-	0x14, 0x73, 0x6d, 0x61, 0x72, 0x74, 0x5f, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x64,
-	0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x73, 0x6d, 0x61,
-	0x72, 0x74, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22,
-	0x37, 0x0a, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x12, 0x26, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x10, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x54, 0x61, 0x73,
-	0x6b, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x5e, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x4b,
-	0x65, 0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x65,
-	0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x09, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69,
-	0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73,
-	0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0x1b, 0x0a, 0x07, 0x4b, 0x65, 0x79, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x59, 0x0a, 0x0f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43,
-	0x68, 0x65, 0x63, 0x6b, 0x73, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72,
+	0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x41, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x6d, 0x61, 0x78,
+	0x5f, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x0c, 0x6d, 0x61, 0x78, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x30,
+	0x0a, 0x14, 0x73, 0x6d, 0x61, 0x72, 0x74, 0x5f, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x5f, 0x61,
+	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x73, 0x6d,
+	0x61, 0x72, 0x74, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
+	0x12, 0x12, 0x0a, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x6d, 0x65, 0x6d, 0x6f, 0x12, 0x2a, 0x0a, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x07, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72,
+	0x2e, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73,
+	0x12, 0x2a, 0x0a, 0x05, 0x65, 0x64, 0x67, 0x65, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x14, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x54, 0x61, 0x73,
+	0x6b, 0x45, 0x64, 0x67, 0x65, 0x52, 0x05, 0x65, 0x64, 0x67, 0x65, 0x73, 0x22, 0x20, 0x0a, 0x0e,
+	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0e,
+	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x24,
+	0x0a, 0x0c, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14,
+	0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f,
+	0x77, 0x6e, 0x65, 0x72, 0x22, 0x21, 0x0a, 0x09, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73,
+	0x70, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x6f, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x6e, 0x6f, 0x6e, 0x63, 0x65, 0x22, 0x3d, 0x0a, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x57,
+	0x61, 0x6c, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x61, 0x63, 0x74,
+	0x6f, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x61, 0x63, 0x74, 0x6f,
+	0x72, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x61, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x04, 0x73, 0x61, 0x6c, 0x74, 0x22, 0x55, 0x0a, 0x0b, 0x53, 0x6d, 0x61, 0x72, 0x74, 0x57,
+	0x61, 0x6c, 0x6c, 0x65, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12,
+	0x12, 0x0a, 0x04, 0x73, 0x61, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73,
+	0x61, 0x6c, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x22, 0x43, 0x0a,
+	0x0e, 0x4c, 0x69, 0x73, 0x74, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x31, 0x0a, 0x07, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x17, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x53, 0x6d,
+	0x61, 0x72, 0x74, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x52, 0x07, 0x77, 0x61, 0x6c, 0x6c, 0x65,
+	0x74, 0x73, 0x22, 0x40, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52,
+	0x65, 0x71, 0x12, 0x30, 0x0a, 0x14, 0x73, 0x6d, 0x61, 0x72, 0x74, 0x5f, 0x77, 0x61, 0x6c, 0x6c,
+	0x65, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x12, 0x73, 0x6d, 0x61, 0x72, 0x74, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x41, 0x64, 0x64,
+	0x72, 0x65, 0x73, 0x73, 0x22, 0x37, 0x0a, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x73, 0x6b,
+	0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f,
+	0x72, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x5e, 0x0a,
+	0x09, 0x47, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x77,
+	0x6e, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72,
+	0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x41, 0x74, 0x12,
+	0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0x1b, 0x0a,
+	0x07, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x59, 0x0a, 0x0f, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a,
+	0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
+	0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61,
+	0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e,
+	0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4d, 0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43,
+	0x68, 0x65, 0x63, 0x6b, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x39, 0x0a, 0x0a, 0x75, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x64, 0x41, 0x74, 0x22, 0x4e, 0x0a, 0x0f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x57, 0x61,
+	0x6c, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x61, 0x6c, 0x74, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x61, 0x6c, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x66,
+	0x61, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x41, 0x64, 0x64,
+	0x72, 0x65, 0x73, 0x73, 0x22, 0x69, 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x57, 0x61,
+	0x6c, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72,
 	0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65,
-	0x73, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
-	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
-	0x22, 0x4d, 0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x39, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f,
-	0x61, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73,
-	0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x22,
-	0x4e, 0x0a, 0x0f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x52,
-	0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x61, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x61, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
 	0x52, 0x04, 0x73, 0x61, 0x6c, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72,
-	0x79, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0e, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22,
-	0x69, 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a,
-	0x04, 0x73, 0x61, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x61, 0x6c,
-	0x74, 0x12, 0x27, 0x0a, 0x0f, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x5f, 0x61, 0x64, 0x64,
-	0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x66, 0x61, 0x63, 0x74,
-	0x6f, 0x72, 0x79, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x2a, 0x6c, 0x0a, 0x0b, 0x54, 0x72,
-	0x69, 0x67, 0x67, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x11, 0x0a, 0x0d, 0x4d, 0x61, 0x6e,
-	0x75, 0x61, 0x6c, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x10, 0x00, 0x12, 0x15, 0x0a, 0x11,
-	0x46, 0x69, 0x78, 0x65, 0x64, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65,
-	0x72, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x43, 0x72, 0x6f, 0x6e, 0x54, 0x72, 0x69, 0x67, 0x67,
-	0x65, 0x72, 0x10, 0x02, 0x12, 0x10, 0x0a, 0x0c, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x54, 0x72, 0x69,
-	0x67, 0x67, 0x65, 0x72, 0x10, 0x03, 0x12, 0x10, 0x0a, 0x0c, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54,
-	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x10, 0x04, 0x2a, 0xc8, 0x01, 0x0a, 0x05, 0x45, 0x72, 0x72,
-	0x6f, 0x72, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x45, 0x72, 0x72, 0x6f,
-	0x72, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0c, 0x52, 0x70, 0x63, 0x4e, 0x6f, 0x64, 0x65, 0x45, 0x72,
-	0x72, 0x6f, 0x72, 0x10, 0xe8, 0x07, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67,
-	0x65, 0x55, 0x6e, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x10, 0xd0, 0x0f, 0x12,
-	0x16, 0x0a, 0x11, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x57, 0x72, 0x69, 0x74, 0x65, 0x45,
-	0x72, 0x72, 0x6f, 0x72, 0x10, 0xd1, 0x0f, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x61, 0x72, 0x74,
-	0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x52, 0x70, 0x63, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xf0,
-	0x2e, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x6d, 0x61, 0x72, 0x74, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74,
-	0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xf1, 0x2e,
-	0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x43, 0x6f, 0x72, 0x72,
-	0x75, 0x70, 0x74, 0x65, 0x64, 0x10, 0xd8, 0x36, 0x12, 0x19, 0x0a, 0x14, 0x54, 0x61, 0x73, 0x6b,
-	0x44, 0x61, 0x74, 0x61, 0x4d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x45, 0x72, 0x72, 0x6f, 0x72,
-	0x10, 0xd9, 0x36, 0x2a, 0x50, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x12, 0x0a, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x10, 0x00, 0x12, 0x0d, 0x0a,
-	0x09, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06,
-	0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0x02, 0x12, 0x0c, 0x0a, 0x08, 0x43, 0x61, 0x6e, 0x63,
-	0x65, 0x6c, 0x65, 0x64, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74,
-	0x69, 0x6e, 0x67, 0x10, 0x04, 0x2a, 0x20, 0x0a, 0x0e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43,
-	0x6f, 0x64, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x0a, 0x4a, 0x61, 0x76, 0x61, 0x53,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x10, 0x00, 0x32, 0x9e, 0x06, 0x0a, 0x0a, 0x41, 0x67, 0x67, 0x72,
-	0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x36, 0x0a, 0x06, 0x47, 0x65, 0x74, 0x4b, 0x65, 0x79,
-	0x12, 0x15, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x47, 0x65,
-	0x74, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x71, 0x1a, 0x13, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67,
-	0x61, 0x74, 0x6f, 0x72, 0x2e, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x3d,
-	0x0a, 0x08, 0x47, 0x65, 0x74, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x12, 0x18, 0x2e, 0x61, 0x67, 0x67,
-	0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f,
-	0x72, 0x2e, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x4b, 0x0a,
-	0x0c, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x12, 0x1b, 0x2e,
-	0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74,
-	0x65, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x1c, 0x2e, 0x61, 0x67, 0x67,
-	0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x57, 0x61,
-	0x6c, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x46, 0x0a, 0x0b, 0x4c, 0x69,
-	0x73, 0x74, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x73, 0x12, 0x19, 0x2e, 0x61, 0x67, 0x67, 0x72,
-	0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x57, 0x61, 0x6c, 0x6c, 0x65,
-	0x74, 0x52, 0x65, 0x71, 0x1a, 0x1a, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f,
-	0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70,
-	0x22, 0x00, 0x12, 0x45, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b,
-	0x12, 0x19, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x43, 0x72,
-	0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x1a, 0x1a, 0x2e, 0x61, 0x67,
-	0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54,
-	0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x42, 0x0a, 0x09, 0x4c, 0x69, 0x73,
-	0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x18, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61,
-	0x74, 0x6f, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x71,
-	0x1a, 0x19, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x4c, 0x69,
-	0x73, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x30, 0x0a,
-	0x07, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x11, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65,
-	0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x49, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x10, 0x2e, 0x61, 0x67,
-	0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x22, 0x00, 0x12,
-	0x3d, 0x0a, 0x0a, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x11, 0x2e,
-	0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x49, 0x64, 0x52, 0x65, 0x71,
-	0x1a, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x00, 0x12, 0x3d,
-	0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x11, 0x2e, 0x61,
-	0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x49, 0x64, 0x52, 0x65, 0x71, 0x1a,
-	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x00, 0x12, 0x36, 0x0a,
-	0x04, 0x50, 0x69, 0x6e, 0x67, 0x12, 0x13, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74,
-	0x6f, 0x72, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x69, 0x6e, 0x1a, 0x17, 0x2e, 0x61, 0x67, 0x67,
-	0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x69, 0x6e, 0x52,
-	0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x44, 0x0a, 0x09, 0x53, 0x79, 0x6e, 0x63, 0x54, 0x61, 0x73,
-	0x6b, 0x73, 0x12, 0x18, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e,
-	0x53, 0x79, 0x6e, 0x63, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x61,
-	0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x54, 0x61,
-	0x73, 0x6b, 0x73, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x30, 0x01, 0x12, 0x4b, 0x0a, 0x0c, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x12, 0x1b, 0x2e, 0x61, 0x67,
-	0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43,
-	0x68, 0x65, 0x63, 0x6b, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x1c, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65,
-	0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x65, 0x63,
-	0x6b, 0x73, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x42, 0x0c, 0x5a, 0x0a, 0x2e, 0x2f, 0x61, 0x76,
-	0x73, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x79, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0e, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x2a,
+	0xc8, 0x01, 0x0a, 0x05, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x6e, 0x6b,
+	0x6e, 0x6f, 0x77, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0c, 0x52, 0x70,
+	0x63, 0x4e, 0x6f, 0x64, 0x65, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xe8, 0x07, 0x12, 0x17, 0x0a,
+	0x12, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x55, 0x6e, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61,
+	0x62, 0x6c, 0x65, 0x10, 0xd0, 0x0f, 0x12, 0x16, 0x0a, 0x11, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67,
+	0x65, 0x57, 0x72, 0x69, 0x74, 0x65, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xd1, 0x0f, 0x12, 0x18,
+	0x0a, 0x13, 0x53, 0x6d, 0x61, 0x72, 0x74, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x52, 0x70, 0x63,
+	0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xf0, 0x2e, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x6d, 0x61, 0x72,
+	0x74, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x45,
+	0x72, 0x72, 0x6f, 0x72, 0x10, 0xf1, 0x2e, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x73, 0x6b, 0x44,
+	0x61, 0x74, 0x61, 0x43, 0x6f, 0x72, 0x72, 0x75, 0x70, 0x74, 0x65, 0x64, 0x10, 0xd8, 0x36, 0x12,
+	0x19, 0x0a, 0x14, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x4d, 0x69, 0x73, 0x73, 0x69,
+	0x6e, 0x67, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xd9, 0x36, 0x2a, 0x50, 0x0a, 0x0a, 0x54, 0x61,
+	0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0a, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69,
+	0x76, 0x65, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
+	0x64, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0x02, 0x12,
+	0x0c, 0x0a, 0x08, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x65, 0x64, 0x10, 0x03, 0x12, 0x0d, 0x0a,
+	0x09, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x10, 0x04, 0x2a, 0x20, 0x0a, 0x0e,
+	0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6f, 0x64, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0e,
+	0x0a, 0x0a, 0x4a, 0x61, 0x76, 0x61, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x10, 0x00, 0x32, 0x9e,
+	0x06, 0x0a, 0x0a, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x36, 0x0a,
+	0x06, 0x47, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x12, 0x15, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67,
+	0x61, 0x74, 0x6f, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x71, 0x1a, 0x13,
+	0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x4b, 0x65, 0x79, 0x52,
+	0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x4e, 0x6f, 0x6e, 0x63,
+	0x65, 0x12, 0x18, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x4e,
+	0x6f, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x61, 0x67,
+	0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x52, 0x65,
+	0x73, 0x70, 0x22, 0x00, 0x12, 0x4b, 0x0a, 0x0c, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x57, 0x61,
+	0x6c, 0x6c, 0x65, 0x74, 0x12, 0x1b, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f,
+	0x72, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x52, 0x65,
+	0x71, 0x1a, 0x1c, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x43,
+	0x72, 0x65, 0x61, 0x74, 0x65, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22,
+	0x00, 0x12, 0x46, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x73,
+	0x12, 0x19, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x4c, 0x69,
+	0x73, 0x74, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x1a, 0x2e, 0x61, 0x67,
+	0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x57, 0x61, 0x6c,
+	0x6c, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x45, 0x0a, 0x0a, 0x43, 0x72, 0x65,
+	0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x19, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67,
+	0x61, 0x74, 0x6f, 0x72, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52,
+	0x65, 0x71, 0x1a, 0x1a, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e,
+	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00,
+	0x12, 0x42, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x18, 0x2e,
+	0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x54,
+	0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67,
+	0x61, 0x74, 0x6f, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65,
+	0x73, 0x70, 0x22, 0x00, 0x12, 0x30, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x12,
+	0x11, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x49, 0x64, 0x52,
+	0x65, 0x71, 0x1a, 0x10, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e,
+	0x54, 0x61, 0x73, 0x6b, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x0a, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c,
+	0x54, 0x61, 0x73, 0x6b, 0x12, 0x11, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f,
+	0x72, 0x2e, 0x49, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54,
+	0x61, 0x73, 0x6b, 0x12, 0x11, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72,
+	0x2e, 0x49, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x22, 0x00, 0x12, 0x36, 0x0a, 0x04, 0x50, 0x69, 0x6e, 0x67, 0x12, 0x13, 0x2e, 0x61,
+	0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x69,
+	0x6e, 0x1a, 0x17, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x43,
+	0x68, 0x65, 0x63, 0x6b, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x44, 0x0a, 0x09,
+	0x53, 0x79, 0x6e, 0x63, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x18, 0x2e, 0x61, 0x67, 0x67, 0x72,
+	0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x54, 0x61, 0x73, 0x6b, 0x73,
+	0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72,
+	0x2e, 0x53, 0x79, 0x6e, 0x63, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00,
+	0x30, 0x01, 0x12, 0x4b, 0x0a, 0x0c, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x65, 0x63,
+	0x6b, 0x73, 0x12, 0x1b, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x52, 0x65, 0x71, 0x1a,
+	0x1c, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x42,
+	0x0c, 0x5a, 0x0a, 0x2e, 0x2f, 0x61, 0x76, 0x73, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -3294,115 +3212,114 @@ func file_protobuf_avs_proto_rawDescGZIP() []byte {
 	return file_protobuf_avs_proto_rawDescData
 }
 
-var file_protobuf_avs_proto_enumTypes = make([]protoimpl.EnumInfo, 4)
+var file_protobuf_avs_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
 var file_protobuf_avs_proto_msgTypes = make([]protoimpl.MessageInfo, 42)
 var file_protobuf_avs_proto_goTypes = []interface{}{
-	(TriggerType)(0),              // 0: aggregator.TriggerType
-	(Error)(0),                    // 1: aggregator.Error
-	(TaskStatus)(0),               // 2: aggregator.TaskStatus
-	(CustomCodeType)(0),           // 3: aggregator.CustomCodeType
-	(*IdReq)(nil),                 // 4: aggregator.IdReq
-	(*Checkin)(nil),               // 5: aggregator.Checkin
-	(*CheckinResp)(nil),           // 6: aggregator.CheckinResp
-	(*SyncTasksReq)(nil),          // 7: aggregator.SyncTasksReq
-	(*FixedEpochCondition)(nil),   // 8: aggregator.FixedEpochCondition
-	(*CronCondition)(nil),         // 9: aggregator.CronCondition
-	(*BlockCondition)(nil),        // 10: aggregator.BlockCondition
-	(*EventCondition)(nil),        // 11: aggregator.EventCondition
-	(*TaskTrigger)(nil),           // 12: aggregator.TaskTrigger
-	(*SyncTasksResp)(nil),         // 13: aggregator.SyncTasksResp
-	(*ETHTransferNode)(nil),       // 14: aggregator.ETHTransferNode
-	(*ContractWriteNode)(nil),     // 15: aggregator.ContractWriteNode
-	(*ContractReadNode)(nil),      // 16: aggregator.ContractReadNode
-	(*GraphQLQueryNode)(nil),      // 17: aggregator.GraphQLQueryNode
-	(*RestAPINode)(nil),           // 18: aggregator.RestAPINode
-	(*CustomCodeNode)(nil),        // 19: aggregator.CustomCodeNode
-	(*Condition)(nil),             // 20: aggregator.Condition
-	(*BranchNode)(nil),            // 21: aggregator.BranchNode
-	(*FilterNode)(nil),            // 22: aggregator.FilterNode
-	(*LoopNode)(nil),              // 23: aggregator.LoopNode
-	(*TaskEdge)(nil),              // 24: aggregator.TaskEdge
-	(*TaskNode)(nil),              // 25: aggregator.TaskNode
-	(*Execution)(nil),             // 26: aggregator.Execution
-	(*Task)(nil),                  // 27: aggregator.Task
-	(*CreateTaskReq)(nil),         // 28: aggregator.CreateTaskReq
-	(*CreateTaskResp)(nil),        // 29: aggregator.CreateTaskResp
-	(*NonceRequest)(nil),          // 30: aggregator.NonceRequest
-	(*NonceResp)(nil),             // 31: aggregator.NonceResp
-	(*ListWalletReq)(nil),         // 32: aggregator.ListWalletReq
-	(*SmartWallet)(nil),           // 33: aggregator.SmartWallet
-	(*ListWalletResp)(nil),        // 34: aggregator.ListWalletResp
-	(*ListTasksReq)(nil),          // 35: aggregator.ListTasksReq
-	(*ListTasksResp)(nil),         // 36: aggregator.ListTasksResp
-	(*GetKeyReq)(nil),             // 37: aggregator.GetKeyReq
-	(*KeyResp)(nil),               // 38: aggregator.KeyResp
-	(*UpdateChecksReq)(nil),       // 39: aggregator.UpdateChecksReq
-	(*UpdateChecksResp)(nil),      // 40: aggregator.UpdateChecksResp
-	(*CreateWalletReq)(nil),       // 41: aggregator.CreateWalletReq
-	(*CreateWalletResp)(nil),      // 42: aggregator.CreateWalletResp
-	(*Checkin_Status)(nil),        // 43: aggregator.Checkin.Status
-	nil,                           // 44: aggregator.GraphQLQueryNode.VariablesEntry
-	nil,                           // 45: aggregator.RestAPINode.HeadersEntry
-	(*timestamppb.Timestamp)(nil), // 46: google.protobuf.Timestamp
-	(*wrapperspb.BoolValue)(nil),  // 47: google.protobuf.BoolValue
+	(Error)(0),                    // 0: aggregator.Error
+	(TaskStatus)(0),               // 1: aggregator.TaskStatus
+	(CustomCodeType)(0),           // 2: aggregator.CustomCodeType
+	(*IdReq)(nil),                 // 3: aggregator.IdReq
+	(*Checkin)(nil),               // 4: aggregator.Checkin
+	(*CheckinResp)(nil),           // 5: aggregator.CheckinResp
+	(*SyncTasksReq)(nil),          // 6: aggregator.SyncTasksReq
+	(*FixedEpochCondition)(nil),   // 7: aggregator.FixedEpochCondition
+	(*CronCondition)(nil),         // 8: aggregator.CronCondition
+	(*BlockCondition)(nil),        // 9: aggregator.BlockCondition
+	(*EventCondition)(nil),        // 10: aggregator.EventCondition
+	(*TaskTrigger)(nil),           // 11: aggregator.TaskTrigger
+	(*SyncTasksResp)(nil),         // 12: aggregator.SyncTasksResp
+	(*ETHTransferNode)(nil),       // 13: aggregator.ETHTransferNode
+	(*ContractWriteNode)(nil),     // 14: aggregator.ContractWriteNode
+	(*ContractReadNode)(nil),      // 15: aggregator.ContractReadNode
+	(*GraphQLQueryNode)(nil),      // 16: aggregator.GraphQLQueryNode
+	(*RestAPINode)(nil),           // 17: aggregator.RestAPINode
+	(*CustomCodeNode)(nil),        // 18: aggregator.CustomCodeNode
+	(*Condition)(nil),             // 19: aggregator.Condition
+	(*BranchNode)(nil),            // 20: aggregator.BranchNode
+	(*FilterNode)(nil),            // 21: aggregator.FilterNode
+	(*LoopNode)(nil),              // 22: aggregator.LoopNode
+	(*TaskEdge)(nil),              // 23: aggregator.TaskEdge
+	(*TaskNode)(nil),              // 24: aggregator.TaskNode
+	(*Execution)(nil),             // 25: aggregator.Execution
+	(*Task)(nil),                  // 26: aggregator.Task
+	(*CreateTaskReq)(nil),         // 27: aggregator.CreateTaskReq
+	(*CreateTaskResp)(nil),        // 28: aggregator.CreateTaskResp
+	(*NonceRequest)(nil),          // 29: aggregator.NonceRequest
+	(*NonceResp)(nil),             // 30: aggregator.NonceResp
+	(*ListWalletReq)(nil),         // 31: aggregator.ListWalletReq
+	(*SmartWallet)(nil),           // 32: aggregator.SmartWallet
+	(*ListWalletResp)(nil),        // 33: aggregator.ListWalletResp
+	(*ListTasksReq)(nil),          // 34: aggregator.ListTasksReq
+	(*ListTasksResp)(nil),         // 35: aggregator.ListTasksResp
+	(*GetKeyReq)(nil),             // 36: aggregator.GetKeyReq
+	(*KeyResp)(nil),               // 37: aggregator.KeyResp
+	(*UpdateChecksReq)(nil),       // 38: aggregator.UpdateChecksReq
+	(*UpdateChecksResp)(nil),      // 39: aggregator.UpdateChecksResp
+	(*CreateWalletReq)(nil),       // 40: aggregator.CreateWalletReq
+	(*CreateWalletResp)(nil),      // 41: aggregator.CreateWalletResp
+	(*Checkin_Status)(nil),        // 42: aggregator.Checkin.Status
+	nil,                           // 43: aggregator.GraphQLQueryNode.VariablesEntry
+	nil,                           // 44: aggregator.RestAPINode.HeadersEntry
+	(*timestamppb.Timestamp)(nil), // 45: google.protobuf.Timestamp
+	(*wrapperspb.BoolValue)(nil),  // 46: google.protobuf.BoolValue
 }
 var file_protobuf_avs_proto_depIdxs = []int32{
-	43, // 0: aggregator.Checkin.status:type_name -> aggregator.Checkin.Status
-	46, // 1: aggregator.CheckinResp.updated_at:type_name -> google.protobuf.Timestamp
-	8,  // 2: aggregator.TaskTrigger.at:type_name -> aggregator.FixedEpochCondition
-	9,  // 3: aggregator.TaskTrigger.cron:type_name -> aggregator.CronCondition
-	10, // 4: aggregator.TaskTrigger.block:type_name -> aggregator.BlockCondition
-	11, // 5: aggregator.TaskTrigger.event:type_name -> aggregator.EventCondition
-	12, // 6: aggregator.SyncTasksResp.trigger:type_name -> aggregator.TaskTrigger
-	44, // 7: aggregator.GraphQLQueryNode.variables:type_name -> aggregator.GraphQLQueryNode.VariablesEntry
-	45, // 8: aggregator.RestAPINode.headers:type_name -> aggregator.RestAPINode.HeadersEntry
-	3,  // 9: aggregator.CustomCodeNode.type:type_name -> aggregator.CustomCodeType
-	20, // 10: aggregator.BranchNode.conditions:type_name -> aggregator.Condition
-	14, // 11: aggregator.TaskNode.eth_transfer:type_name -> aggregator.ETHTransferNode
-	15, // 12: aggregator.TaskNode.contract_write:type_name -> aggregator.ContractWriteNode
-	16, // 13: aggregator.TaskNode.contract_read:type_name -> aggregator.ContractReadNode
-	17, // 14: aggregator.TaskNode.graphql_data_query:type_name -> aggregator.GraphQLQueryNode
-	18, // 15: aggregator.TaskNode.rest_api:type_name -> aggregator.RestAPINode
-	21, // 16: aggregator.TaskNode.branch:type_name -> aggregator.BranchNode
-	22, // 17: aggregator.TaskNode.filter:type_name -> aggregator.FilterNode
-	23, // 18: aggregator.TaskNode.loop:type_name -> aggregator.LoopNode
-	19, // 19: aggregator.TaskNode.custom_code:type_name -> aggregator.CustomCodeNode
-	2,  // 20: aggregator.Task.status:type_name -> aggregator.TaskStatus
-	12, // 21: aggregator.Task.trigger:type_name -> aggregator.TaskTrigger
-	25, // 22: aggregator.Task.nodes:type_name -> aggregator.TaskNode
-	24, // 23: aggregator.Task.edges:type_name -> aggregator.TaskEdge
-	26, // 24: aggregator.Task.executions:type_name -> aggregator.Execution
-	12, // 25: aggregator.CreateTaskReq.trigger:type_name -> aggregator.TaskTrigger
-	25, // 26: aggregator.CreateTaskReq.nodes:type_name -> aggregator.TaskNode
-	24, // 27: aggregator.CreateTaskReq.edges:type_name -> aggregator.TaskEdge
-	33, // 28: aggregator.ListWalletResp.wallets:type_name -> aggregator.SmartWallet
-	27, // 29: aggregator.ListTasksResp.tasks:type_name -> aggregator.Task
-	46, // 30: aggregator.UpdateChecksResp.updated_at:type_name -> google.protobuf.Timestamp
-	46, // 31: aggregator.Checkin.Status.last_heartbeat:type_name -> google.protobuf.Timestamp
-	37, // 32: aggregator.Aggregator.GetKey:input_type -> aggregator.GetKeyReq
-	30, // 33: aggregator.Aggregator.GetNonce:input_type -> aggregator.NonceRequest
-	41, // 34: aggregator.Aggregator.CreateWallet:input_type -> aggregator.CreateWalletReq
-	32, // 35: aggregator.Aggregator.ListWallets:input_type -> aggregator.ListWalletReq
-	28, // 36: aggregator.Aggregator.CreateTask:input_type -> aggregator.CreateTaskReq
-	35, // 37: aggregator.Aggregator.ListTasks:input_type -> aggregator.ListTasksReq
-	4,  // 38: aggregator.Aggregator.GetTask:input_type -> aggregator.IdReq
-	4,  // 39: aggregator.Aggregator.CancelTask:input_type -> aggregator.IdReq
-	4,  // 40: aggregator.Aggregator.DeleteTask:input_type -> aggregator.IdReq
-	5,  // 41: aggregator.Aggregator.Ping:input_type -> aggregator.Checkin
-	7,  // 42: aggregator.Aggregator.SyncTasks:input_type -> aggregator.SyncTasksReq
-	39, // 43: aggregator.Aggregator.UpdateChecks:input_type -> aggregator.UpdateChecksReq
-	38, // 44: aggregator.Aggregator.GetKey:output_type -> aggregator.KeyResp
-	31, // 45: aggregator.Aggregator.GetNonce:output_type -> aggregator.NonceResp
-	42, // 46: aggregator.Aggregator.CreateWallet:output_type -> aggregator.CreateWalletResp
-	34, // 47: aggregator.Aggregator.ListWallets:output_type -> aggregator.ListWalletResp
-	29, // 48: aggregator.Aggregator.CreateTask:output_type -> aggregator.CreateTaskResp
-	36, // 49: aggregator.Aggregator.ListTasks:output_type -> aggregator.ListTasksResp
-	27, // 50: aggregator.Aggregator.GetTask:output_type -> aggregator.Task
-	47, // 51: aggregator.Aggregator.CancelTask:output_type -> google.protobuf.BoolValue
-	47, // 52: aggregator.Aggregator.DeleteTask:output_type -> google.protobuf.BoolValue
-	6,  // 53: aggregator.Aggregator.Ping:output_type -> aggregator.CheckinResp
-	13, // 54: aggregator.Aggregator.SyncTasks:output_type -> aggregator.SyncTasksResp
-	40, // 55: aggregator.Aggregator.UpdateChecks:output_type -> aggregator.UpdateChecksResp
+	42, // 0: aggregator.Checkin.status:type_name -> aggregator.Checkin.Status
+	45, // 1: aggregator.CheckinResp.updated_at:type_name -> google.protobuf.Timestamp
+	7,  // 2: aggregator.TaskTrigger.fixed_time:type_name -> aggregator.FixedEpochCondition
+	8,  // 3: aggregator.TaskTrigger.cron:type_name -> aggregator.CronCondition
+	9,  // 4: aggregator.TaskTrigger.block:type_name -> aggregator.BlockCondition
+	10, // 5: aggregator.TaskTrigger.event:type_name -> aggregator.EventCondition
+	11, // 6: aggregator.SyncTasksResp.trigger:type_name -> aggregator.TaskTrigger
+	43, // 7: aggregator.GraphQLQueryNode.variables:type_name -> aggregator.GraphQLQueryNode.VariablesEntry
+	44, // 8: aggregator.RestAPINode.headers:type_name -> aggregator.RestAPINode.HeadersEntry
+	2,  // 9: aggregator.CustomCodeNode.type:type_name -> aggregator.CustomCodeType
+	19, // 10: aggregator.BranchNode.conditions:type_name -> aggregator.Condition
+	13, // 11: aggregator.TaskNode.eth_transfer:type_name -> aggregator.ETHTransferNode
+	14, // 12: aggregator.TaskNode.contract_write:type_name -> aggregator.ContractWriteNode
+	15, // 13: aggregator.TaskNode.contract_read:type_name -> aggregator.ContractReadNode
+	16, // 14: aggregator.TaskNode.graphql_data_query:type_name -> aggregator.GraphQLQueryNode
+	17, // 15: aggregator.TaskNode.rest_api:type_name -> aggregator.RestAPINode
+	20, // 16: aggregator.TaskNode.branch:type_name -> aggregator.BranchNode
+	21, // 17: aggregator.TaskNode.filter:type_name -> aggregator.FilterNode
+	22, // 18: aggregator.TaskNode.loop:type_name -> aggregator.LoopNode
+	18, // 19: aggregator.TaskNode.custom_code:type_name -> aggregator.CustomCodeNode
+	1,  // 20: aggregator.Task.status:type_name -> aggregator.TaskStatus
+	11, // 21: aggregator.Task.trigger:type_name -> aggregator.TaskTrigger
+	24, // 22: aggregator.Task.nodes:type_name -> aggregator.TaskNode
+	23, // 23: aggregator.Task.edges:type_name -> aggregator.TaskEdge
+	25, // 24: aggregator.Task.executions:type_name -> aggregator.Execution
+	11, // 25: aggregator.CreateTaskReq.trigger:type_name -> aggregator.TaskTrigger
+	24, // 26: aggregator.CreateTaskReq.nodes:type_name -> aggregator.TaskNode
+	23, // 27: aggregator.CreateTaskReq.edges:type_name -> aggregator.TaskEdge
+	32, // 28: aggregator.ListWalletResp.wallets:type_name -> aggregator.SmartWallet
+	26, // 29: aggregator.ListTasksResp.tasks:type_name -> aggregator.Task
+	45, // 30: aggregator.UpdateChecksResp.updated_at:type_name -> google.protobuf.Timestamp
+	45, // 31: aggregator.Checkin.Status.last_heartbeat:type_name -> google.protobuf.Timestamp
+	36, // 32: aggregator.Aggregator.GetKey:input_type -> aggregator.GetKeyReq
+	29, // 33: aggregator.Aggregator.GetNonce:input_type -> aggregator.NonceRequest
+	40, // 34: aggregator.Aggregator.CreateWallet:input_type -> aggregator.CreateWalletReq
+	31, // 35: aggregator.Aggregator.ListWallets:input_type -> aggregator.ListWalletReq
+	27, // 36: aggregator.Aggregator.CreateTask:input_type -> aggregator.CreateTaskReq
+	34, // 37: aggregator.Aggregator.ListTasks:input_type -> aggregator.ListTasksReq
+	3,  // 38: aggregator.Aggregator.GetTask:input_type -> aggregator.IdReq
+	3,  // 39: aggregator.Aggregator.CancelTask:input_type -> aggregator.IdReq
+	3,  // 40: aggregator.Aggregator.DeleteTask:input_type -> aggregator.IdReq
+	4,  // 41: aggregator.Aggregator.Ping:input_type -> aggregator.Checkin
+	6,  // 42: aggregator.Aggregator.SyncTasks:input_type -> aggregator.SyncTasksReq
+	38, // 43: aggregator.Aggregator.UpdateChecks:input_type -> aggregator.UpdateChecksReq
+	37, // 44: aggregator.Aggregator.GetKey:output_type -> aggregator.KeyResp
+	30, // 45: aggregator.Aggregator.GetNonce:output_type -> aggregator.NonceResp
+	41, // 46: aggregator.Aggregator.CreateWallet:output_type -> aggregator.CreateWalletResp
+	33, // 47: aggregator.Aggregator.ListWallets:output_type -> aggregator.ListWalletResp
+	28, // 48: aggregator.Aggregator.CreateTask:output_type -> aggregator.CreateTaskResp
+	35, // 49: aggregator.Aggregator.ListTasks:output_type -> aggregator.ListTasksResp
+	26, // 50: aggregator.Aggregator.GetTask:output_type -> aggregator.Task
+	46, // 51: aggregator.Aggregator.CancelTask:output_type -> google.protobuf.BoolValue
+	46, // 52: aggregator.Aggregator.DeleteTask:output_type -> google.protobuf.BoolValue
+	5,  // 53: aggregator.Aggregator.Ping:output_type -> aggregator.CheckinResp
+	12, // 54: aggregator.Aggregator.SyncTasks:output_type -> aggregator.SyncTasksResp
+	39, // 55: aggregator.Aggregator.UpdateChecks:output_type -> aggregator.UpdateChecksResp
 	44, // [44:56] is the sub-list for method output_type
 	32, // [32:44] is the sub-list for method input_type
 	32, // [32:32] is the sub-list for extension type_name
@@ -3899,7 +3816,7 @@ func file_protobuf_avs_proto_init() {
 	}
 	file_protobuf_avs_proto_msgTypes[8].OneofWrappers = []interface{}{
 		(*TaskTrigger_Manual)(nil),
-		(*TaskTrigger_At)(nil),
+		(*TaskTrigger_FixedTime)(nil),
 		(*TaskTrigger_Cron)(nil),
 		(*TaskTrigger_Block)(nil),
 		(*TaskTrigger_Event)(nil),
@@ -3920,7 +3837,7 @@ func file_protobuf_avs_proto_init() {
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_protobuf_avs_proto_rawDesc,
-			NumEnums:      4,
+			NumEnums:      3,
 			NumMessages:   42,
 			NumExtensions: 0,
 			NumServices:   1,
diff --git a/protobuf/avs.proto b/protobuf/avs.proto
index 808a747..61bc670 100644
--- a/protobuf/avs.proto
+++ b/protobuf/avs.proto
@@ -39,20 +39,12 @@ message SyncTasksReq {
   int64  monotonic_clock = 4;
 }
 
-enum TriggerType {
-  ManualTrigger        = 0;
-  FixedEpochTrigger  = 1;
-  CronTrigger        = 2;
-  BlockTrigger       = 3;
-  EventTrigger         = 4;
-}
-
 message FixedEpochCondition {
-  repeated int64 epoches = 1;
+  repeated int64 epochs = 1;
 }
 // Simple timebase or cron syntax.
 message CronCondition {
-  repeated string cron_table = 1;
+  repeated string schedule = 1;
 }
 
 message BlockCondition {
@@ -75,19 +67,19 @@ message EventCondition {
 
 message TaskTrigger {
   oneof trigger_type {
-    bool                   manual     = 2;
+    bool                   manual  = 1;
 
     // run at a specific epoch, name inspired by unix `at` utility
-    FixedEpochCondition    at      = 3;
+    FixedEpochCondition    fixed_time   = 2;
 
     // interval such as every hour/day/ etc can be converted to cronsyntax by the sdk/studio
-    CronCondition          cron       = 4;
+    CronCondition          cron    = 3;
    
     // currently the only support syntax is every <x> blocks
-    BlockCondition         block      = 5;
+    BlockCondition         block   = 4;
 
     // support filter by event expression such as topic0, topic1, topoc2 and event_data and contract_address
-    EventCondition         event      = 6;
+    EventCondition         event   = 5;
   }
 }
 
@@ -189,14 +181,11 @@ message FilterNode {
   string expression = 1;
 }
 
+// LoopNode currently not support, but we pre-defined to reverse the field id
 message LoopNode {
   // name the iteration key and value.
   string iter_var = 1;
   string iter_key = 2;
-  // func can be the built-in function
-  string iter_func = 3;
-  // jj
-  string iter_node = 4;
 }
 
 // The edge is relationship or direct between node
@@ -244,19 +233,19 @@ message Task {
   string smart_wallet_address = 3;
 
   // task won't be check before this
-  int64  start_at   = 5;
+  int64  start_at   = 4;
   // task won't be run/check after this
-  int64  expired_at = 6;
+  int64  expired_at = 5;
   // arbitrary data about this task. has a limit of 255 character
-  string memo = 7;
+  string memo = 6;
 
-  int64 completed_at = 8;
+  int64 completed_at = 7;
 
   // limit on how many time this task can run. Set to 0 will make it run unlimited until cancelling or reaching its expired time
-  int64 max_execution = 10;
+  int64 max_execution = 8;
 
   TaskStatus status  = 9;
-  TaskTrigger trigger = 4;
+  TaskTrigger trigger = 10;
   repeated TaskNode nodes = 11;
   repeated TaskEdge edges = 12;
 
@@ -270,8 +259,7 @@ message CreateTaskReq {
   int64 start_at               = 2;
   int64 expired_at             = 3;
 
-  // A repeatable task will continue to be run
-  bool repeatable              = 4;
+  int64 max_execution          = 4;
 
   // the smart wallet address that will be used to run this task
   // When leaving out, we will use the default(salt=0) wallet