From d329f010d9bbd2d6cc2c926e34b6e989c4d6a7f8 Mon Sep 17 00:00:00 2001
From: Michael Pretorius <michael@ixo.world>
Date: Fri, 11 Oct 2024 17:43:38 +0200
Subject: [PATCH] feat(claims): add intents and oracle approval payment

---
 app/ante.go                            |   10 +-
 app/keepers/keepers.go                 |    1 +
 docs/core/proto-docs.html              |  777 +++++++++-
 docs/core/proto-docs.json              |  859 ++++++++++-
 docs/core/proto-docs.md                |  261 +++-
 docs/swagger-ui/swagger.yaml           | 1807 ++++++++++++++++++++++--
 proto/ixo/claims/v1beta1/authz.proto   |   14 +
 proto/ixo/claims/v1beta1/claims.proto  |  103 +-
 proto/ixo/claims/v1beta1/event.proto   |    8 +-
 proto/ixo/claims/v1beta1/genesis.proto |    1 +
 proto/ixo/claims/v1beta1/query.proto   |   26 +
 proto/ixo/claims/v1beta1/tx.proto      |   84 +-
 wasmbinding/stargate_whitelist.go      |    8 +
 x/bonds/types/tx.go                    |    2 -
 x/claims/abci.go                       |   50 +
 x/claims/autocli.go                    |   11 +
 x/claims/client/cli/tx.go              |   24 +
 x/claims/keeper/claims.go              |  190 +++
 x/claims/keeper/genesis.go             |    9 +-
 x/claims/keeper/grpc_query.go          |   40 +
 x/claims/keeper/keeper.go              |   35 +-
 x/claims/keeper/msg_server.go          |  366 ++++-
 x/claims/keeper/payments.go            |  107 +-
 x/claims/module.go                     |    7 +
 x/claims/types/authz.go                |   73 +-
 x/claims/types/authz.pb.go             |  308 +++-
 x/claims/types/claims.go               |  159 ++-
 x/claims/types/claims.pb.go            | 1508 ++++++++++++++++++--
 x/claims/types/codec.go                |    4 +
 x/claims/types/cw20.go                 |   22 +-
 x/claims/types/errors.go               |    5 +
 x/claims/types/event.pb.go             |  412 +++++-
 x/claims/types/expected_keepers.go     |    7 +
 x/claims/types/genesis.pb.go           |  103 +-
 x/claims/types/keys.go                 |   24 +
 x/claims/types/msg_validation.go       |   60 +-
 x/claims/types/params.go               |   11 +-
 x/claims/types/query.pb.go             | 1295 ++++++++++++++---
 x/claims/types/query.pb.gw.go          |  228 +++
 x/claims/types/tx.go                   |   24 +
 x/claims/types/tx.pb.go                | 1501 ++++++++++++++++++--
 41 files changed, 9525 insertions(+), 1019 deletions(-)
 mode change 100755 => 100644 proto/ixo/claims/v1beta1/query.proto
 create mode 100644 x/claims/abci.go

diff --git a/app/ante.go b/app/ante.go
index f61de993..8f0fc399 100755
--- a/app/ante.go
+++ b/app/ante.go
@@ -68,6 +68,7 @@ func IxoAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 		authante.NewSigGasConsumeDecorator(options.AccountKeeper, sigGasConsumer),
 		authante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
 		authante.NewIncrementSequenceDecorator(options.AccountKeeper),
+		ibcante.NewRedundantRelayDecorator(options.IBCKeeper),
 	)
 
 	// authenticatorVerificationDecorator is the new authenticator flow that's embedded into the circuit breaker ante
@@ -92,16 +93,15 @@ func IxoAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 		authante.NewValidateMemoDecorator(options.AccountKeeper),
 		authante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
 
+		// TODO: analyse how to make smart accounts work for iid handlers
+		iidante.NewIidResolutionDecorator(options.IidKeeper),
+		entityante.NewBlockNftContractTransferForEntityDecorator(options.EntityKeeper),
+
 		smartaccountante.NewCircuitBreakerDecorator(
 			options.smartAccountKeeper,
 			authenticatorVerificationDecorator,
 			classicSignatureVerificationDecorator,
 		),
-
-		ibcante.NewRedundantRelayDecorator(options.IBCKeeper),
-		// TODO: analyse how smart accounts affect iid handlers
-		iidante.NewIidResolutionDecorator(options.IidKeeper),
-		entityante.NewBlockNftContractTransferForEntityDecorator(options.EntityKeeper),
 	}
 
 	return sdk.ChainAnteDecorators(anteDecorators...), nil
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
index 0c3dcf32..2c36e63d 100755
--- a/app/keepers/keepers.go
+++ b/app/keepers/keepers.go
@@ -528,6 +528,7 @@ func NewAppKeepers(
 		appKeepers.BankKeeper,
 		appKeepers.EntityKeeper,
 		appKeepers.ContractKeeper,
+		appKeepers.AccountKeeper,
 	)
 
 	// Initialize authenticators
diff --git a/docs/core/proto-docs.html b/docs/core/proto-docs.html
index 1744b582..3ed5cb24 100755
--- a/docs/core/proto-docs.html
+++ b/docs/core/proto-docs.html
@@ -565,6 +565,10 @@ <h2>Table of Contents</h2>
                   <a href="#ixo.claims.v1beta1.Evaluation"><span class="badge">M</span>Evaluation</a>
                 </li>
               
+                <li>
+                  <a href="#ixo.claims.v1beta1.Intent"><span class="badge">M</span>Intent</a>
+                </li>
+              
                 <li>
                   <a href="#ixo.claims.v1beta1.Params"><span class="badge">M</span>Params</a>
                 </li>
@@ -578,6 +582,10 @@ <h2>Table of Contents</h2>
                 </li>
               
               
+                <li>
+                  <a href="#ixo.claims.v1beta1.CollectionIntentOptions"><span class="badge">E</span>CollectionIntentOptions</a>
+                </li>
+              
                 <li>
                   <a href="#ixo.claims.v1beta1.CollectionState"><span class="badge">E</span>CollectionState</a>
                 </li>
@@ -586,6 +594,10 @@ <h2>Table of Contents</h2>
                   <a href="#ixo.claims.v1beta1.EvaluationStatus"><span class="badge">E</span>EvaluationStatus</a>
                 </li>
               
+                <li>
+                  <a href="#ixo.claims.v1beta1.IntentStatus"><span class="badge">E</span>IntentStatus</a>
+                </li>
+              
                 <li>
                   <a href="#ixo.claims.v1beta1.PaymentStatus"><span class="badge">E</span>PaymentStatus</a>
                 </li>
@@ -663,6 +675,14 @@ <h2>Table of Contents</h2>
                   <a href="#ixo.claims.v1beta1.CollectionUpdatedEvent"><span class="badge">M</span>CollectionUpdatedEvent</a>
                 </li>
               
+                <li>
+                  <a href="#ixo.claims.v1beta1.IntentSubmittedEvent"><span class="badge">M</span>IntentSubmittedEvent</a>
+                </li>
+              
+                <li>
+                  <a href="#ixo.claims.v1beta1.IntentUpdatedEvent"><span class="badge">M</span>IntentUpdatedEvent</a>
+                </li>
+              
                 <li>
                   <a href="#ixo.claims.v1beta1.PaymentWithdrawCreatedEvent"><span class="badge">M</span>PaymentWithdrawCreatedEvent</a>
                 </li>
@@ -745,6 +765,22 @@ <h2>Table of Contents</h2>
                   <a href="#ixo.claims.v1beta1.QueryDisputeResponse"><span class="badge">M</span>QueryDisputeResponse</a>
                 </li>
               
+                <li>
+                  <a href="#ixo.claims.v1beta1.QueryIntentListRequest"><span class="badge">M</span>QueryIntentListRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#ixo.claims.v1beta1.QueryIntentListResponse"><span class="badge">M</span>QueryIntentListResponse</a>
+                </li>
+              
+                <li>
+                  <a href="#ixo.claims.v1beta1.QueryIntentRequest"><span class="badge">M</span>QueryIntentRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#ixo.claims.v1beta1.QueryIntentResponse"><span class="badge">M</span>QueryIntentResponse</a>
+                </li>
+              
                 <li>
                   <a href="#ixo.claims.v1beta1.QueryParamsRequest"><span class="badge">M</span>QueryParamsRequest</a>
                 </li>
@@ -768,6 +804,14 @@ <h2>Table of Contents</h2>
             <a href="#ixo%2fclaims%2fv1beta1%2ftx.proto">ixo/claims/v1beta1/tx.proto</a>
             <ul>
               
+                <li>
+                  <a href="#ixo.claims.v1beta1.MsgClaimIntent"><span class="badge">M</span>MsgClaimIntent</a>
+                </li>
+              
+                <li>
+                  <a href="#ixo.claims.v1beta1.MsgClaimIntentResponse"><span class="badge">M</span>MsgClaimIntentResponse</a>
+                </li>
+              
                 <li>
                   <a href="#ixo.claims.v1beta1.MsgCreateCollection"><span class="badge">M</span>MsgCreateCollection</a>
                 </li>
@@ -808,6 +852,14 @@ <h2>Table of Contents</h2>
                   <a href="#ixo.claims.v1beta1.MsgUpdateCollectionDatesResponse"><span class="badge">M</span>MsgUpdateCollectionDatesResponse</a>
                 </li>
               
+                <li>
+                  <a href="#ixo.claims.v1beta1.MsgUpdateCollectionIntents"><span class="badge">M</span>MsgUpdateCollectionIntents</a>
+                </li>
+              
+                <li>
+                  <a href="#ixo.claims.v1beta1.MsgUpdateCollectionIntentsResponse"><span class="badge">M</span>MsgUpdateCollectionIntentsResponse</a>
+                </li>
+              
                 <li>
                   <a href="#ixo.claims.v1beta1.MsgUpdateCollectionPayments"><span class="badge">M</span>MsgUpdateCollectionPayments</a>
                 </li>
@@ -5083,7 +5135,31 @@ <h3 id="ixo.claims.v1beta1.Claim">Claim</h3>
                   <td>payments_status</td>
                   <td><a href="#ixo.claims.v1beta1.ClaimPayments">ClaimPayments</a></td>
                   <td></td>
-                  <td><p> </p></td>
+                  <td><p>payments_status is the status of the payments for the claim </p></td>
+                </tr>
+              
+                <tr>
+                  <td>use_intent</td>
+                  <td><a href="#bool">bool</a></td>
+                  <td></td>
+                  <td><p>intent_id is the id of the intent for this claim, if any </p></td>
+                </tr>
+              
+                <tr>
+                  <td>amount</td>
+                  <td><a href="#cosmos.base.v1beta1.Coin">cosmos.base.v1beta1.Coin</a></td>
+                  <td>repeated</td>
+                  <td><p>NOTE: if both amount and cw20 amount are empty then use default by
+Collection custom amount specified by service agent for claim approval </p></td>
+                </tr>
+              
+                <tr>
+                  <td>cw20_payment</td>
+                  <td><a href="#ixo.claims.v1beta1.CW20Payment">CW20Payment</a></td>
+                  <td>repeated</td>
+                  <td><p>NOTE: if both amount and cw20 amount are empty then use default by
+Collection custom cw20 payments specified by service agent for claim
+approval </p></td>
                 </tr>
               
             </tbody>
@@ -5268,6 +5344,23 @@ <h3 id="ixo.claims.v1beta1.Collection">Collection</h3>
 (internally calculated) </p></td>
                 </tr>
               
+                <tr>
+                  <td>escrow_account</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>escrow_account is the escrow account address for this collection created at
+collection creation, current purpose is to transfer payments to escrow
+account for GUARANTEED payments through intents </p></td>
+                </tr>
+              
+                <tr>
+                  <td>intents</td>
+                  <td><a href="#ixo.claims.v1beta1.CollectionIntentOptions">CollectionIntentOptions</a></td>
+                  <td></td>
+                  <td><p>intents is the option for intents for this collection (allow, deny,
+required) </p></td>
+                </tr>
+              
             </tbody>
           </table>
 
@@ -5477,16 +5570,117 @@ <h3 id="ixo.claims.v1beta1.Evaluation">Evaluation</h3>
                   <td>amount</td>
                   <td><a href="#cosmos.base.v1beta1.Coin">cosmos.base.v1beta1.Coin</a></td>
                   <td>repeated</td>
-                  <td><p>custom amount specified by evaluator for claim approval, if empty list then
-use default by Collection </p></td>
+                  <td><p>if both amount and cw20 amount are empty then use default by Collection
+custom amount specified by evaluator for claim approval </p></td>
+                </tr>
+              
+                <tr>
+                  <td>cw20_payment</td>
+                  <td><a href="#ixo.claims.v1beta1.CW20Payment">CW20Payment</a></td>
+                  <td>repeated</td>
+                  <td><p>custom cw20 payments specified by evaluator for claim approval </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="ixo.claims.v1beta1.Intent">Intent</h3>
+        <p>Intent defines the structure for a service agent's claim intent.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>id is the incremented internal id for the intent </p></td>
+                </tr>
+              
+                <tr>
+                  <td>agent_did</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>The service agent&#39;s DID (Decentralized Identifier). </p></td>
+                </tr>
+              
+                <tr>
+                  <td>agent_address</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>The service agent&#39;s address. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>collection_id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>The id of the collection this intent is linked to. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>claim_id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>claim_id (optional, set when claim is submitted) </p></td>
+                </tr>
+              
+                <tr>
+                  <td>created_at</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td></td>
+                  <td><p>The time the intent was created. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>expire_at</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td></td>
+                  <td><p>Timeout period for the intent. If the claim is not submitted by this time,
+the intent expires. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>status</td>
+                  <td><a href="#ixo.claims.v1beta1.IntentStatus">IntentStatus</a></td>
+                  <td></td>
+                  <td><p>Status of the intent (e.g., &#34;ACTIVE&#34; or &#34;FULFILLED&#34;). </p></td>
+                </tr>
+              
+                <tr>
+                  <td>amount</td>
+                  <td><a href="#cosmos.base.v1beta1.Coin">cosmos.base.v1beta1.Coin</a></td>
+                  <td>repeated</td>
+                  <td><p>The payment amount the agent intends to claim, if any. </p></td>
                 </tr>
               
                 <tr>
                   <td>cw20_payment</td>
                   <td><a href="#ixo.claims.v1beta1.CW20Payment">CW20Payment</a></td>
                   <td>repeated</td>
-                  <td><p>custom cw20 payments specified by evaluator for claim approval, if empty
-list then use default by Collection </p></td>
+                  <td><p>The CW20Payment amount the agent intends to claim, if any. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>from_address</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>the address the escrow payment came from </p></td>
+                </tr>
+              
+                <tr>
+                  <td>escrow_address</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>the escrow account address </p></td>
                 </tr>
               
             </tbody>
@@ -5534,6 +5728,13 @@ <h3 id="ixo.claims.v1beta1.Params">Params</h3>
                   <td><p> </p></td>
                 </tr>
               
+                <tr>
+                  <td>intent_sequence</td>
+                  <td><a href="#uint64">uint64</a></td>
+                  <td></td>
+                  <td><p> </p></td>
+                </tr>
+              
             </tbody>
           </table>
 
@@ -5587,6 +5788,15 @@ <h3 id="ixo.claims.v1beta1.Payment">Payment</h3>
                   <td><p>cw20 payments, can be empty or multiple </p></td>
                 </tr>
               
+                <tr>
+                  <td>is_oracle_payment</td>
+                  <td><a href="#bool">bool</a></td>
+                  <td></td>
+                  <td><p>boolean to indicate if the payment is for oracle payments, aka it will go
+through network fees split NOTE: if true the payment can only have amount
+values(Native coins), no cw20 payments allowed then </p></td>
+                </tr>
+              
             </tbody>
           </table>
 
@@ -5641,6 +5851,37 @@ <h3 id="ixo.claims.v1beta1.Payments">Payments</h3>
       
 
       
+        <h3 id="ixo.claims.v1beta1.CollectionIntentOptions">CollectionIntentOptions</h3>
+        <p></p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>ALLOW</td>
+                <td>0</td>
+                <td><p>Allow: Intents can be made for claims, but claims can also be made without
+intents.</p></td>
+              </tr>
+            
+              <tr>
+                <td>DENY</td>
+                <td>1</td>
+                <td><p>Deny: Intents cannot be made for claims for the collection.</p></td>
+              </tr>
+            
+              <tr>
+                <td>REQUIRED</td>
+                <td>2</td>
+                <td><p>Required: Claims cannot be made without an associated intent. An intent is
+mandatory before a claim can be submitted.</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
         <h3 id="ixo.claims.v1beta1.CollectionState">CollectionState</h3>
         <p></p>
         <table class="enum-table">
@@ -5711,6 +5952,39 @@ <h3 id="ixo.claims.v1beta1.EvaluationStatus">EvaluationStatus</h3>
           </tbody>
         </table>
       
+        <h3 id="ixo.claims.v1beta1.IntentStatus">IntentStatus</h3>
+        <p></p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>ACTIVE</td>
+                <td>0</td>
+                <td><p>Active: Intent is created and active, payments have been transferred to
+escrow if there is any</p></td>
+              </tr>
+            
+              <tr>
+                <td>FULFILLED</td>
+                <td>1</td>
+                <td><p>Fulfilled: Intent is fulfilled, was used to create a claim and funds will
+be released on claim APPROVAL, or funds will be reverted on claim REJECTION
+or DISPUTE</p></td>
+              </tr>
+            
+              <tr>
+                <td>EXPIRED</td>
+                <td>2</td>
+                <td><p>Expired: Intent has expired, payments have been transferred back out of
+escrow</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
         <h3 id="ixo.claims.v1beta1.PaymentStatus">PaymentStatus</h3>
         <p></p>
         <table class="enum-table">
@@ -5728,37 +6002,37 @@ <h3 id="ixo.claims.v1beta1.PaymentStatus">PaymentStatus</h3>
               <tr>
                 <td>PROMISED</td>
                 <td>1</td>
-                <td><p>agent is contracted to receive payment</p></td>
+                <td><p>Promised: Agent is contracted to receive payment</p></td>
               </tr>
             
               <tr>
                 <td>AUTHORIZED</td>
                 <td>2</td>
-                <td><p>authz set up, no guarantee</p></td>
+                <td><p>Authorized: Authz set up, no guarantee</p></td>
               </tr>
             
               <tr>
                 <td>GUARANTEED</td>
                 <td>3</td>
-                <td><p>escrow set up with funds blocked</p></td>
+                <td><p>Guaranteed: Escrow set up with funds blocked</p></td>
               </tr>
             
               <tr>
                 <td>PAID</td>
                 <td>4</td>
-                <td><p></p></td>
+                <td><p>Paid: Funds have been paid</p></td>
               </tr>
             
               <tr>
                 <td>FAILED</td>
                 <td>5</td>
-                <td><p></p></td>
+                <td><p>Failed: Payment failed, most probably due to insufficient funds</p></td>
               </tr>
             
               <tr>
                 <td>DISPUTED_PAYMENT</td>
                 <td>6</td>
-                <td><p></p></td>
+                <td><p>DisputedPayment: Payment disputed</p></td>
               </tr>
             
           </tbody>
@@ -5958,6 +6232,30 @@ <h3 id="ixo.claims.v1beta1.SubmitClaimConstraints">SubmitClaimConstraints</h3>
                   <td><p> </p></td>
                 </tr>
               
+                <tr>
+                  <td>max_amount</td>
+                  <td><a href="#cosmos.base.v1beta1.Coin">cosmos.base.v1beta1.Coin</a></td>
+                  <td>repeated</td>
+                  <td><p>custom max_amount allowed to be specified by service agent for claim
+approval, if empty then no custom amount is allowed </p></td>
+                </tr>
+              
+                <tr>
+                  <td>max_cw20_payment</td>
+                  <td><a href="#ixo.claims.v1beta1.CW20Payment">CW20Payment</a></td>
+                  <td>repeated</td>
+                  <td><p>custom max_cw20_payment allowed to be specified by service agent for claim
+approval, if empty then no custom amount is allowed </p></td>
+                </tr>
+              
+                <tr>
+                  <td>intent_duration_ns</td>
+                  <td><a href="#google.protobuf.Duration">google.protobuf.Duration</a></td>
+                  <td></td>
+                  <td><p>intent_duration_ns is the duration for which the intent is active, after
+which it will expire (in nanoseconds) </p></td>
+                </tr>
+              
             </tbody>
           </table>
 
@@ -6236,8 +6534,8 @@ <h3 id="ixo.claims.v1beta1.CollectionUpdatedEvent">CollectionUpdatedEvent</h3>
 
         
       
-        <h3 id="ixo.claims.v1beta1.PaymentWithdrawCreatedEvent">PaymentWithdrawCreatedEvent</h3>
-        <p>ClaimDisputedEvent is an event triggered on a Claim dispute</p>
+        <h3 id="ixo.claims.v1beta1.IntentSubmittedEvent">IntentSubmittedEvent</h3>
+        <p>IntentSubmittedEvent is an event triggered on an Intent submission</p>
 
         
           <table class="field-table">
@@ -6247,8 +6545,8 @@ <h3 id="ixo.claims.v1beta1.PaymentWithdrawCreatedEvent">PaymentWithdrawCreatedEv
             <tbody>
               
                 <tr>
-                  <td>withdraw</td>
-                  <td><a href="#ixo.claims.v1beta1.WithdrawPaymentConstraints">WithdrawPaymentConstraints</a></td>
+                  <td>intent</td>
+                  <td><a href="#ixo.claims.v1beta1.Intent">Intent</a></td>
                   <td></td>
                   <td><p> </p></td>
                 </tr>
@@ -6260,8 +6558,8 @@ <h3 id="ixo.claims.v1beta1.PaymentWithdrawCreatedEvent">PaymentWithdrawCreatedEv
 
         
       
-        <h3 id="ixo.claims.v1beta1.PaymentWithdrawnEvent">PaymentWithdrawnEvent</h3>
-        <p>ClaimDisputedEvent is an event triggered on a Claim dispute</p>
+        <h3 id="ixo.claims.v1beta1.IntentUpdatedEvent">IntentUpdatedEvent</h3>
+        <p>IntentUpdatedEvent is an event triggered on an Intent update</p>
 
         
           <table class="field-table">
@@ -6271,8 +6569,8 @@ <h3 id="ixo.claims.v1beta1.PaymentWithdrawnEvent">PaymentWithdrawnEvent</h3>
             <tbody>
               
                 <tr>
-                  <td>withdraw</td>
-                  <td><a href="#ixo.claims.v1beta1.WithdrawPaymentConstraints">WithdrawPaymentConstraints</a></td>
+                  <td>intent</td>
+                  <td><a href="#ixo.claims.v1beta1.Intent">Intent</a></td>
                   <td></td>
                   <td><p> </p></td>
                 </tr>
@@ -6284,22 +6582,8 @@ <h3 id="ixo.claims.v1beta1.PaymentWithdrawnEvent">PaymentWithdrawnEvent</h3>
 
         
       
-
-      
-
-      
-
-      
-    
-      
-      <div class="file-heading">
-        <h2 id="ixo/claims/v1beta1/genesis.proto">ixo/claims/v1beta1/genesis.proto</h2><a href="#title">Top</a>
-      </div>
-      <p></p>
-
-      
-        <h3 id="ixo.claims.v1beta1.GenesisState">GenesisState</h3>
-        <p>GenesisState defines the claims module's genesis state.</p>
+        <h3 id="ixo.claims.v1beta1.PaymentWithdrawCreatedEvent">PaymentWithdrawCreatedEvent</h3>
+        <p>ClaimDisputedEvent is an event triggered on a Claim dispute</p>
 
         
           <table class="field-table">
@@ -6309,17 +6593,79 @@ <h3 id="ixo.claims.v1beta1.GenesisState">GenesisState</h3>
             <tbody>
               
                 <tr>
-                  <td>params</td>
-                  <td><a href="#ixo.claims.v1beta1.Params">Params</a></td>
+                  <td>withdraw</td>
+                  <td><a href="#ixo.claims.v1beta1.WithdrawPaymentConstraints">WithdrawPaymentConstraints</a></td>
                   <td></td>
                   <td><p> </p></td>
                 </tr>
               
-                <tr>
-                  <td>collections</td>
-                  <td><a href="#ixo.claims.v1beta1.Collection">Collection</a></td>
-                  <td>repeated</td>
-                  <td><p> </p></td>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="ixo.claims.v1beta1.PaymentWithdrawnEvent">PaymentWithdrawnEvent</h3>
+        <p>ClaimDisputedEvent is an event triggered on a Claim dispute</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>withdraw</td>
+                  <td><a href="#ixo.claims.v1beta1.WithdrawPaymentConstraints">WithdrawPaymentConstraints</a></td>
+                  <td></td>
+                  <td><p> </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+
+      
+
+      
+
+      
+    
+      
+      <div class="file-heading">
+        <h2 id="ixo/claims/v1beta1/genesis.proto">ixo/claims/v1beta1/genesis.proto</h2><a href="#title">Top</a>
+      </div>
+      <p></p>
+
+      
+        <h3 id="ixo.claims.v1beta1.GenesisState">GenesisState</h3>
+        <p>GenesisState defines the claims module's genesis state.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>params</td>
+                  <td><a href="#ixo.claims.v1beta1.Params">Params</a></td>
+                  <td></td>
+                  <td><p> </p></td>
+                </tr>
+              
+                <tr>
+                  <td>collections</td>
+                  <td><a href="#ixo.claims.v1beta1.Collection">Collection</a></td>
+                  <td>repeated</td>
+                  <td><p> </p></td>
                 </tr>
               
                 <tr>
@@ -6336,6 +6682,13 @@ <h3 id="ixo.claims.v1beta1.GenesisState">GenesisState</h3>
                   <td><p> </p></td>
                 </tr>
               
+                <tr>
+                  <td>intents</td>
+                  <td><a href="#ixo.claims.v1beta1.Intent">Intent</a></td>
+                  <td>repeated</td>
+                  <td><p> </p></td>
+                </tr>
+              
             </tbody>
           </table>
 
@@ -6666,6 +7019,123 @@ <h3 id="ixo.claims.v1beta1.QueryDisputeResponse">QueryDisputeResponse</h3>
 
         
       
+        <h3 id="ixo.claims.v1beta1.QueryIntentListRequest">QueryIntentListRequest</h3>
+        <p></p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>pagination</td>
+                  <td><a href="#cosmos.base.query.v1beta1.PageRequest">cosmos.base.query.v1beta1.PageRequest</a></td>
+                  <td></td>
+                  <td><p> </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="ixo.claims.v1beta1.QueryIntentListResponse">QueryIntentListResponse</h3>
+        <p></p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>intents</td>
+                  <td><a href="#ixo.claims.v1beta1.Intent">Intent</a></td>
+                  <td>repeated</td>
+                  <td><p> </p></td>
+                </tr>
+              
+                <tr>
+                  <td>pagination</td>
+                  <td><a href="#cosmos.base.query.v1beta1.PageResponse">cosmos.base.query.v1beta1.PageResponse</a></td>
+                  <td></td>
+                  <td><p> </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="ixo.claims.v1beta1.QueryIntentRequest">QueryIntentRequest</h3>
+        <p></p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p> </p></td>
+                </tr>
+              
+                <tr>
+                  <td>agentAddress</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p> </p></td>
+                </tr>
+              
+                <tr>
+                  <td>collectionId</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p> </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="ixo.claims.v1beta1.QueryIntentResponse">QueryIntentResponse</h3>
+        <p></p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>intent</td>
+                  <td><a href="#ixo.claims.v1beta1.Intent">Intent</a></td>
+                  <td></td>
+                  <td><p> </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
         <h3 id="ixo.claims.v1beta1.QueryParamsRequest">QueryParamsRequest</h3>
         <p></p>
 
@@ -6760,6 +7230,20 @@ <h3 id="ixo.claims.v1beta1.Query">Query</h3>
                 <td><p></p></td>
               </tr>
             
+              <tr>
+                <td>Intent</td>
+                <td><a href="#ixo.claims.v1beta1.QueryIntentRequest">QueryIntentRequest</a></td>
+                <td><a href="#ixo.claims.v1beta1.QueryIntentResponse">QueryIntentResponse</a></td>
+                <td><p></p></td>
+              </tr>
+            
+              <tr>
+                <td>IntentList</td>
+                <td><a href="#ixo.claims.v1beta1.QueryIntentListRequest">QueryIntentListRequest</a></td>
+                <td><a href="#ixo.claims.v1beta1.QueryIntentListResponse">QueryIntentListResponse</a></td>
+                <td><p></p></td>
+              </tr>
+            
           </tbody>
         </table>
 
@@ -6848,6 +7332,26 @@ <h4>Methods with HTTP bindings</h4>
               </tr>
               
             
+              
+              
+              <tr>
+                <td>Intent</td>
+                <td>GET</td>
+                <td>/ixo/intent/{agentAddress}/{collectionId}/{id}</td>
+                <td></td>
+              </tr>
+              
+            
+              
+              
+              <tr>
+                <td>IntentList</td>
+                <td>GET</td>
+                <td>/ixo/intent</td>
+                <td></td>
+              </tr>
+              
+            
             </tbody>
           </table>
           
@@ -6860,6 +7364,92 @@ <h2 id="ixo/claims/v1beta1/tx.proto">ixo/claims/v1beta1/tx.proto</h2><a href="#t
       <p></p>
 
       
+        <h3 id="ixo.claims.v1beta1.MsgClaimIntent">MsgClaimIntent</h3>
+        <p></p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>agent_did</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>The service agent&#39;s DID (Decentralized Identifier). </p></td>
+                </tr>
+              
+                <tr>
+                  <td>agent_address</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>The service agent&#39;s address (who submits this message). </p></td>
+                </tr>
+              
+                <tr>
+                  <td>collection_id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>The id of the collection this intent is linked to. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>amount</td>
+                  <td><a href="#cosmos.base.v1beta1.Coin">cosmos.base.v1beta1.Coin</a></td>
+                  <td>repeated</td>
+                  <td><p>NOTE: if both amount and cw20 amount are empty then default by Collection
+is used (APPROVAL payment). The desired claim amount, if any. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>cw20_payment</td>
+                  <td><a href="#ixo.claims.v1beta1.CW20Payment">CW20Payment</a></td>
+                  <td>repeated</td>
+                  <td><p>NOTE: if both amount and cw20 amount are empty then default by Collection
+is used (APPROVAL payment). The custom CW20 payment, if any. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="ixo.claims.v1beta1.MsgClaimIntentResponse">MsgClaimIntentResponse</h3>
+        <p>MsgClaimIntentResponse defines the response after submitting an intent.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>intent_id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Resulting intent id. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>expire_at</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td></td>
+                  <td><p>Timeout period for the intent. If the claim is not submitted by this time,
+the intent expires. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
         <h3 id="ixo.claims.v1beta1.MsgCreateCollection">MsgCreateCollection</h3>
         <p></p>
 
@@ -6928,6 +7518,14 @@ <h3 id="ixo.claims.v1beta1.MsgCreateCollection">MsgCreateCollection</h3>
 rejection </p></td>
                 </tr>
               
+                <tr>
+                  <td>intents</td>
+                  <td><a href="#ixo.claims.v1beta1.CollectionIntentOptions">CollectionIntentOptions</a></td>
+                  <td></td>
+                  <td><p>intents is the option for intents for this collection (allow, deny,
+required) </p></td>
+                </tr>
+              
             </tbody>
           </table>
 
@@ -7082,16 +7680,16 @@ <h3 id="ixo.claims.v1beta1.MsgEvaluateClaim">MsgEvaluateClaim</h3>
                   <td>amount</td>
                   <td><a href="#cosmos.base.v1beta1.Coin">cosmos.base.v1beta1.Coin</a></td>
                   <td>repeated</td>
-                  <td><p>custom amount specified by evaluator for claim approval, if empty list then
-use default by Collection </p></td>
+                  <td><p>NOTE: if both amount and cw20 amount are empty then use collection default
+custom amount specified by evaluator for claim approval </p></td>
                 </tr>
               
                 <tr>
                   <td>cw20_payment</td>
                   <td><a href="#ixo.claims.v1beta1.CW20Payment">CW20Payment</a></td>
                   <td>repeated</td>
-                  <td><p>custom cw20 payments specified by evaluator for claim approval, if empty
-list then use default by Collection </p></td>
+                  <td><p>NOTE: if both amount and cw20 amount are empty then use collection default
+custom cw20 payments specified by evaluator for claim approval </p></td>
                 </tr>
               
             </tbody>
@@ -7153,6 +7751,33 @@ <h3 id="ixo.claims.v1beta1.MsgSubmitClaim">MsgSubmitClaim</h3>
                   <td><p>admin address used to sign this message, validated against Collection Admin </p></td>
                 </tr>
               
+                <tr>
+                  <td>use_intent</td>
+                  <td><a href="#bool">bool</a></td>
+                  <td></td>
+                  <td><p>use_intent is the option for using intent for this claim if it exists and
+is active. NOTE: if use_intent is true then amount and cw20 amount are
+ignored and overriden with intent amounts. NOTE: if use_intent is true and
+there is no active intent then will error </p></td>
+                </tr>
+              
+                <tr>
+                  <td>amount</td>
+                  <td><a href="#cosmos.base.v1beta1.Coin">cosmos.base.v1beta1.Coin</a></td>
+                  <td>repeated</td>
+                  <td><p>NOTE: if both amount and cw20_payment are empty then use default by
+Collection custom amount specified by service agent for claim approval </p></td>
+                </tr>
+              
+                <tr>
+                  <td>cw20_payment</td>
+                  <td><a href="#ixo.claims.v1beta1.CW20Payment">CW20Payment</a></td>
+                  <td>repeated</td>
+                  <td><p>NOTE: if both amount and cw20 amount are empty then use default by
+Collection custom cw20 payments specified by service agent for claim
+approval </p></td>
+                </tr>
+              
             </tbody>
           </table>
 
@@ -7220,6 +7845,52 @@ <h3 id="ixo.claims.v1beta1.MsgUpdateCollectionDatesResponse">MsgUpdateCollection
 
         
       
+        <h3 id="ixo.claims.v1beta1.MsgUpdateCollectionIntents">MsgUpdateCollectionIntents</h3>
+        <p></p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>collection_id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>collection_id indicates which Collection to update </p></td>
+                </tr>
+              
+                <tr>
+                  <td>intents</td>
+                  <td><a href="#ixo.claims.v1beta1.CollectionIntentOptions">CollectionIntentOptions</a></td>
+                  <td></td>
+                  <td><p>intents is the option for intents for this collection (allow, deny,
+required) </p></td>
+                </tr>
+              
+                <tr>
+                  <td>admin_address</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>admin address used to sign this message, validated against Collection Admin </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="ixo.claims.v1beta1.MsgUpdateCollectionIntentsResponse">MsgUpdateCollectionIntentsResponse</h3>
+        <p></p>
+
+        
+
+        
+      
         <h3 id="ixo.claims.v1beta1.MsgUpdateCollectionPayments">MsgUpdateCollectionPayments</h3>
         <p></p>
 
@@ -7478,6 +8149,20 @@ <h3 id="ixo.claims.v1beta1.Msg">Msg</h3>
                 <td><p></p></td>
               </tr>
             
+              <tr>
+                <td>UpdateCollectionIntents</td>
+                <td><a href="#ixo.claims.v1beta1.MsgUpdateCollectionIntents">MsgUpdateCollectionIntents</a></td>
+                <td><a href="#ixo.claims.v1beta1.MsgUpdateCollectionIntentsResponse">MsgUpdateCollectionIntentsResponse</a></td>
+                <td><p></p></td>
+              </tr>
+            
+              <tr>
+                <td>ClaimIntent</td>
+                <td><a href="#ixo.claims.v1beta1.MsgClaimIntent">MsgClaimIntent</a></td>
+                <td><a href="#ixo.claims.v1beta1.MsgClaimIntentResponse">MsgClaimIntentResponse</a></td>
+                <td><p></p></td>
+              </tr>
+            
           </tbody>
         </table>
 
diff --git a/docs/core/proto-docs.json b/docs/core/proto-docs.json
index a46582cd..363f6e28 100755
--- a/docs/core/proto-docs.json
+++ b/docs/core/proto-docs.json
@@ -3968,6 +3968,29 @@
       "hasMessages": true,
       "hasServices": false,
       "enums": [
+        {
+          "name": "CollectionIntentOptions",
+          "longName": "CollectionIntentOptions",
+          "fullName": "ixo.claims.v1beta1.CollectionIntentOptions",
+          "description": "",
+          "values": [
+            {
+              "name": "ALLOW",
+              "number": "0",
+              "description": "Allow: Intents can be made for claims, but claims can also be made without\nintents."
+            },
+            {
+              "name": "DENY",
+              "number": "1",
+              "description": "Deny: Intents cannot be made for claims for the collection."
+            },
+            {
+              "name": "REQUIRED",
+              "number": "2",
+              "description": "Required: Claims cannot be made without an associated intent. An intent is\nmandatory before a claim can be submitted."
+            }
+          ]
+        },
         {
           "name": "CollectionState",
           "longName": "CollectionState",
@@ -4024,6 +4047,29 @@
             }
           ]
         },
+        {
+          "name": "IntentStatus",
+          "longName": "IntentStatus",
+          "fullName": "ixo.claims.v1beta1.IntentStatus",
+          "description": "",
+          "values": [
+            {
+              "name": "ACTIVE",
+              "number": "0",
+              "description": "Active: Intent is created and active, payments have been transferred to\nescrow if there is any"
+            },
+            {
+              "name": "FULFILLED",
+              "number": "1",
+              "description": "Fulfilled: Intent is fulfilled, was used to create a claim and funds will\nbe released on claim APPROVAL, or funds will be reverted on claim REJECTION\nor DISPUTE"
+            },
+            {
+              "name": "EXPIRED",
+              "number": "2",
+              "description": "Expired: Intent has expired, payments have been transferred back out of\nescrow"
+            }
+          ]
+        },
         {
           "name": "PaymentStatus",
           "longName": "PaymentStatus",
@@ -4038,32 +4084,32 @@
             {
               "name": "PROMISED",
               "number": "1",
-              "description": "agent is contracted to receive payment"
+              "description": "Promised: Agent is contracted to receive payment"
             },
             {
               "name": "AUTHORIZED",
               "number": "2",
-              "description": "authz set up, no guarantee"
+              "description": "Authorized: Authz set up, no guarantee"
             },
             {
               "name": "GUARANTEED",
               "number": "3",
-              "description": "escrow set up with funds blocked"
+              "description": "Guaranteed: Escrow set up with funds blocked"
             },
             {
               "name": "PAID",
               "number": "4",
-              "description": ""
+              "description": "Paid: Funds have been paid"
             },
             {
               "name": "FAILED",
               "number": "5",
-              "description": ""
+              "description": "Failed: Payment failed, most probably due to insufficient funds"
             },
             {
               "name": "DISPUTED_PAYMENT",
               "number": "6",
-              "description": ""
+              "description": "DisputedPayment: Payment disputed"
             }
           ]
         },
@@ -4218,7 +4264,7 @@
             },
             {
               "name": "payments_status",
-              "description": "",
+              "description": "payments_status is the status of the payments for the claim",
               "label": "",
               "type": "ClaimPayments",
               "longType": "ClaimPayments",
@@ -4227,6 +4273,42 @@
               "isoneof": false,
               "oneofdecl": "",
               "defaultValue": ""
+            },
+            {
+              "name": "use_intent",
+              "description": "intent_id is the id of the intent for this claim, if any",
+              "label": "",
+              "type": "bool",
+              "longType": "bool",
+              "fullType": "bool",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "amount",
+              "description": "NOTE: if both amount and cw20 amount are empty then use default by\nCollection custom amount specified by service agent for claim approval",
+              "label": "repeated",
+              "type": "Coin",
+              "longType": "cosmos.base.v1beta1.Coin",
+              "fullType": "cosmos.base.v1beta1.Coin",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "cw20_payment",
+              "description": "NOTE: if both amount and cw20 amount are empty then use default by\nCollection custom cw20 payments specified by service agent for claim\napproval",
+              "label": "repeated",
+              "type": "CW20Payment",
+              "longType": "CW20Payment",
+              "fullType": "ixo.claims.v1beta1.CW20Payment",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
             }
           ]
         },
@@ -4491,6 +4573,30 @@
               "isoneof": false,
               "oneofdecl": "",
               "defaultValue": ""
+            },
+            {
+              "name": "escrow_account",
+              "description": "escrow_account is the escrow account address for this collection created at\ncollection creation, current purpose is to transfer payments to escrow\naccount for GUARANTEED payments through intents",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "intents",
+              "description": "intents is the option for intents for this collection (allow, deny,\nrequired)",
+              "label": "",
+              "type": "CollectionIntentOptions",
+              "longType": "CollectionIntentOptions",
+              "fullType": "ixo.claims.v1beta1.CollectionIntentOptions",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
             }
           ]
         },
@@ -4770,7 +4876,139 @@
             },
             {
               "name": "amount",
-              "description": "custom amount specified by evaluator for claim approval, if empty list then\nuse default by Collection",
+              "description": "if both amount and cw20 amount are empty then use default by Collection\ncustom amount specified by evaluator for claim approval",
+              "label": "repeated",
+              "type": "Coin",
+              "longType": "cosmos.base.v1beta1.Coin",
+              "fullType": "cosmos.base.v1beta1.Coin",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "cw20_payment",
+              "description": "custom cw20 payments specified by evaluator for claim approval",
+              "label": "repeated",
+              "type": "CW20Payment",
+              "longType": "CW20Payment",
+              "fullType": "ixo.claims.v1beta1.CW20Payment",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            }
+          ]
+        },
+        {
+          "name": "Intent",
+          "longName": "Intent",
+          "fullName": "ixo.claims.v1beta1.Intent",
+          "description": "Intent defines the structure for a service agent's claim intent.",
+          "hasExtensions": false,
+          "hasFields": true,
+          "hasOneofs": false,
+          "extensions": [],
+          "fields": [
+            {
+              "name": "id",
+              "description": "id is the incremented internal id for the intent",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "agent_did",
+              "description": "The service agent's DID (Decentralized Identifier).",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "agent_address",
+              "description": "The service agent's address.",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "collection_id",
+              "description": "The id of the collection this intent is linked to.",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "claim_id",
+              "description": "claim_id (optional, set when claim is submitted)",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "created_at",
+              "description": "The time the intent was created.",
+              "label": "",
+              "type": "Timestamp",
+              "longType": "google.protobuf.Timestamp",
+              "fullType": "google.protobuf.Timestamp",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "expire_at",
+              "description": "Timeout period for the intent. If the claim is not submitted by this time,\nthe intent expires.",
+              "label": "",
+              "type": "Timestamp",
+              "longType": "google.protobuf.Timestamp",
+              "fullType": "google.protobuf.Timestamp",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "status",
+              "description": "Status of the intent (e.g., \"ACTIVE\" or \"FULFILLED\").",
+              "label": "",
+              "type": "IntentStatus",
+              "longType": "IntentStatus",
+              "fullType": "ixo.claims.v1beta1.IntentStatus",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "amount",
+              "description": "The payment amount the agent intends to claim, if any.",
               "label": "repeated",
               "type": "Coin",
               "longType": "cosmos.base.v1beta1.Coin",
@@ -4782,7 +5020,7 @@
             },
             {
               "name": "cw20_payment",
-              "description": "custom cw20 payments specified by evaluator for claim approval, if empty\nlist then use default by Collection",
+              "description": "The CW20Payment amount the agent intends to claim, if any.",
               "label": "repeated",
               "type": "CW20Payment",
               "longType": "CW20Payment",
@@ -4791,6 +5029,30 @@
               "isoneof": false,
               "oneofdecl": "",
               "defaultValue": ""
+            },
+            {
+              "name": "from_address",
+              "description": "the address the escrow payment came from",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "escrow_address",
+              "description": "the escrow account address",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
             }
           ]
         },
@@ -4851,6 +5113,18 @@
               "isoneof": false,
               "oneofdecl": "",
               "defaultValue": ""
+            },
+            {
+              "name": "intent_sequence",
+              "description": "",
+              "label": "",
+              "type": "uint64",
+              "longType": "uint64",
+              "fullType": "uint64",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
             }
           ]
         },
@@ -4923,6 +5197,18 @@
               "isoneof": false,
               "oneofdecl": "",
               "defaultValue": ""
+            },
+            {
+              "name": "is_oracle_payment",
+              "description": "boolean to indicate if the payment is for oracle payments, aka it will go\nthrough network fees split NOTE: if true the payment can only have amount\nvalues(Native coins), no cw20 payments allowed then",
+              "label": "",
+              "type": "bool",
+              "longType": "bool",
+              "fullType": "bool",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
             }
           ]
         },
@@ -5189,27 +5475,63 @@
               "isoneof": false,
               "oneofdecl": "",
               "defaultValue": ""
-            }
-          ]
-        },
-        {
-          "name": "WithdrawPaymentAuthorization",
-          "longName": "WithdrawPaymentAuthorization",
-          "fullName": "ixo.claims.v1beta1.WithdrawPaymentAuthorization",
-          "description": "",
-          "hasExtensions": false,
-          "hasFields": true,
-          "hasOneofs": false,
-          "extensions": [],
-          "fields": [
+            },
             {
-              "name": "admin",
-              "description": "address of admin",
-              "label": "",
-              "type": "string",
-              "longType": "string",
-              "fullType": "string",
-              "ismap": false,
+              "name": "max_amount",
+              "description": "custom max_amount allowed to be specified by service agent for claim\napproval, if empty then no custom amount is allowed",
+              "label": "repeated",
+              "type": "Coin",
+              "longType": "cosmos.base.v1beta1.Coin",
+              "fullType": "cosmos.base.v1beta1.Coin",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "max_cw20_payment",
+              "description": "custom max_cw20_payment allowed to be specified by service agent for claim\napproval, if empty then no custom amount is allowed",
+              "label": "repeated",
+              "type": "CW20Payment",
+              "longType": "CW20Payment",
+              "fullType": "ixo.claims.v1beta1.CW20Payment",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "intent_duration_ns",
+              "description": "intent_duration_ns is the duration for which the intent is active, after\nwhich it will expire (in nanoseconds)",
+              "label": "",
+              "type": "Duration",
+              "longType": "google.protobuf.Duration",
+              "fullType": "google.protobuf.Duration",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            }
+          ]
+        },
+        {
+          "name": "WithdrawPaymentAuthorization",
+          "longName": "WithdrawPaymentAuthorization",
+          "fullName": "ixo.claims.v1beta1.WithdrawPaymentAuthorization",
+          "description": "",
+          "hasExtensions": false,
+          "hasFields": true,
+          "hasOneofs": false,
+          "extensions": [],
+          "fields": [
+            {
+              "name": "admin",
+              "description": "address of admin",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
               "isoneof": false,
               "oneofdecl": "",
               "defaultValue": ""
@@ -5506,6 +5828,54 @@
             }
           ]
         },
+        {
+          "name": "IntentSubmittedEvent",
+          "longName": "IntentSubmittedEvent",
+          "fullName": "ixo.claims.v1beta1.IntentSubmittedEvent",
+          "description": "IntentSubmittedEvent is an event triggered on an Intent submission",
+          "hasExtensions": false,
+          "hasFields": true,
+          "hasOneofs": false,
+          "extensions": [],
+          "fields": [
+            {
+              "name": "intent",
+              "description": "",
+              "label": "",
+              "type": "Intent",
+              "longType": "Intent",
+              "fullType": "ixo.claims.v1beta1.Intent",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            }
+          ]
+        },
+        {
+          "name": "IntentUpdatedEvent",
+          "longName": "IntentUpdatedEvent",
+          "fullName": "ixo.claims.v1beta1.IntentUpdatedEvent",
+          "description": "IntentUpdatedEvent is an event triggered on an Intent update",
+          "hasExtensions": false,
+          "hasFields": true,
+          "hasOneofs": false,
+          "extensions": [],
+          "fields": [
+            {
+              "name": "intent",
+              "description": "",
+              "label": "",
+              "type": "Intent",
+              "longType": "Intent",
+              "fullType": "ixo.claims.v1beta1.Intent",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            }
+          ]
+        },
         {
           "name": "PaymentWithdrawCreatedEvent",
           "longName": "PaymentWithdrawCreatedEvent",
@@ -5625,6 +5995,18 @@
               "isoneof": false,
               "oneofdecl": "",
               "defaultValue": ""
+            },
+            {
+              "name": "intents",
+              "description": "",
+              "label": "repeated",
+              "type": "Intent",
+              "longType": "Intent",
+              "fullType": "ixo.claims.v1beta1.Intent",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
             }
           ]
         }
@@ -5966,6 +6348,138 @@
             }
           ]
         },
+        {
+          "name": "QueryIntentListRequest",
+          "longName": "QueryIntentListRequest",
+          "fullName": "ixo.claims.v1beta1.QueryIntentListRequest",
+          "description": "",
+          "hasExtensions": false,
+          "hasFields": true,
+          "hasOneofs": false,
+          "extensions": [],
+          "fields": [
+            {
+              "name": "pagination",
+              "description": "",
+              "label": "",
+              "type": "PageRequest",
+              "longType": "cosmos.base.query.v1beta1.PageRequest",
+              "fullType": "cosmos.base.query.v1beta1.PageRequest",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            }
+          ]
+        },
+        {
+          "name": "QueryIntentListResponse",
+          "longName": "QueryIntentListResponse",
+          "fullName": "ixo.claims.v1beta1.QueryIntentListResponse",
+          "description": "",
+          "hasExtensions": false,
+          "hasFields": true,
+          "hasOneofs": false,
+          "extensions": [],
+          "fields": [
+            {
+              "name": "intents",
+              "description": "",
+              "label": "repeated",
+              "type": "Intent",
+              "longType": "Intent",
+              "fullType": "ixo.claims.v1beta1.Intent",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "pagination",
+              "description": "",
+              "label": "",
+              "type": "PageResponse",
+              "longType": "cosmos.base.query.v1beta1.PageResponse",
+              "fullType": "cosmos.base.query.v1beta1.PageResponse",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            }
+          ]
+        },
+        {
+          "name": "QueryIntentRequest",
+          "longName": "QueryIntentRequest",
+          "fullName": "ixo.claims.v1beta1.QueryIntentRequest",
+          "description": "",
+          "hasExtensions": false,
+          "hasFields": true,
+          "hasOneofs": false,
+          "extensions": [],
+          "fields": [
+            {
+              "name": "id",
+              "description": "",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "agentAddress",
+              "description": "",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "collectionId",
+              "description": "",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            }
+          ]
+        },
+        {
+          "name": "QueryIntentResponse",
+          "longName": "QueryIntentResponse",
+          "fullName": "ixo.claims.v1beta1.QueryIntentResponse",
+          "description": "",
+          "hasExtensions": false,
+          "hasFields": true,
+          "hasOneofs": false,
+          "extensions": [],
+          "fields": [
+            {
+              "name": "intent",
+              "description": "",
+              "label": "",
+              "type": "Intent",
+              "longType": "Intent",
+              "fullType": "ixo.claims.v1beta1.Intent",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            }
+          ]
+        },
         {
           "name": "QueryParamsRequest",
           "longName": "QueryParamsRequest",
@@ -6162,6 +6676,50 @@
                   ]
                 }
               }
+            },
+            {
+              "name": "Intent",
+              "description": "",
+              "requestType": "QueryIntentRequest",
+              "requestLongType": "QueryIntentRequest",
+              "requestFullType": "ixo.claims.v1beta1.QueryIntentRequest",
+              "requestStreaming": false,
+              "responseType": "QueryIntentResponse",
+              "responseLongType": "QueryIntentResponse",
+              "responseFullType": "ixo.claims.v1beta1.QueryIntentResponse",
+              "responseStreaming": false,
+              "options": {
+                "google.api.http": {
+                  "rules": [
+                    {
+                      "method": "GET",
+                      "pattern": "/ixo/intent/{agentAddress}/{collectionId}/{id}"
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              "name": "IntentList",
+              "description": "",
+              "requestType": "QueryIntentListRequest",
+              "requestLongType": "QueryIntentListRequest",
+              "requestFullType": "ixo.claims.v1beta1.QueryIntentListRequest",
+              "requestStreaming": false,
+              "responseType": "QueryIntentListResponse",
+              "responseLongType": "QueryIntentListResponse",
+              "responseFullType": "ixo.claims.v1beta1.QueryIntentListResponse",
+              "responseStreaming": false,
+              "options": {
+                "google.api.http": {
+                  "rules": [
+                    {
+                      "method": "GET",
+                      "pattern": "/ixo/intent"
+                    }
+                  ]
+                }
+              }
             }
           ]
         }
@@ -6178,6 +6736,114 @@
       "enums": [],
       "extensions": [],
       "messages": [
+        {
+          "name": "MsgClaimIntent",
+          "longName": "MsgClaimIntent",
+          "fullName": "ixo.claims.v1beta1.MsgClaimIntent",
+          "description": "",
+          "hasExtensions": false,
+          "hasFields": true,
+          "hasOneofs": false,
+          "extensions": [],
+          "fields": [
+            {
+              "name": "agent_did",
+              "description": "The service agent's DID (Decentralized Identifier).",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "agent_address",
+              "description": "The service agent's address (who submits this message).",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "collection_id",
+              "description": "The id of the collection this intent is linked to.",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "amount",
+              "description": "NOTE: if both amount and cw20 amount are empty then default by Collection\nis used (APPROVAL payment). The desired claim amount, if any.",
+              "label": "repeated",
+              "type": "Coin",
+              "longType": "cosmos.base.v1beta1.Coin",
+              "fullType": "cosmos.base.v1beta1.Coin",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "cw20_payment",
+              "description": "NOTE: if both amount and cw20 amount are empty then default by Collection\nis used (APPROVAL payment). The custom CW20 payment, if any.",
+              "label": "repeated",
+              "type": "CW20Payment",
+              "longType": "CW20Payment",
+              "fullType": "ixo.claims.v1beta1.CW20Payment",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            }
+          ]
+        },
+        {
+          "name": "MsgClaimIntentResponse",
+          "longName": "MsgClaimIntentResponse",
+          "fullName": "ixo.claims.v1beta1.MsgClaimIntentResponse",
+          "description": "MsgClaimIntentResponse defines the response after submitting an intent.",
+          "hasExtensions": false,
+          "hasFields": true,
+          "hasOneofs": false,
+          "extensions": [],
+          "fields": [
+            {
+              "name": "intent_id",
+              "description": "Resulting intent id.",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "expire_at",
+              "description": "Timeout period for the intent. If the claim is not submitted by this time,\nthe intent expires.",
+              "label": "",
+              "type": "Timestamp",
+              "longType": "google.protobuf.Timestamp",
+              "fullType": "google.protobuf.Timestamp",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            }
+          ]
+        },
         {
           "name": "MsgCreateCollection",
           "longName": "MsgCreateCollection",
@@ -6283,6 +6949,18 @@
               "isoneof": false,
               "oneofdecl": "",
               "defaultValue": ""
+            },
+            {
+              "name": "intents",
+              "description": "intents is the option for intents for this collection (allow, deny,\nrequired)",
+              "label": "",
+              "type": "CollectionIntentOptions",
+              "longType": "CollectionIntentOptions",
+              "fullType": "ixo.claims.v1beta1.CollectionIntentOptions",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
             }
           ]
         },
@@ -6500,7 +7178,7 @@
             },
             {
               "name": "amount",
-              "description": "custom amount specified by evaluator for claim approval, if empty list then\nuse default by Collection",
+              "description": "NOTE: if both amount and cw20 amount are empty then use collection default\ncustom amount specified by evaluator for claim approval",
               "label": "repeated",
               "type": "Coin",
               "longType": "cosmos.base.v1beta1.Coin",
@@ -6512,7 +7190,7 @@
             },
             {
               "name": "cw20_payment",
-              "description": "custom cw20 payments specified by evaluator for claim approval, if empty\nlist then use default by Collection",
+              "description": "NOTE: if both amount and cw20 amount are empty then use collection default\ncustom cw20 payments specified by evaluator for claim approval",
               "label": "repeated",
               "type": "CW20Payment",
               "longType": "CW20Payment",
@@ -6604,6 +7282,42 @@
               "isoneof": false,
               "oneofdecl": "",
               "defaultValue": ""
+            },
+            {
+              "name": "use_intent",
+              "description": "use_intent is the option for using intent for this claim if it exists and\nis active. NOTE: if use_intent is true then amount and cw20 amount are\nignored and overriden with intent amounts. NOTE: if use_intent is true and\nthere is no active intent then will error",
+              "label": "",
+              "type": "bool",
+              "longType": "bool",
+              "fullType": "bool",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "amount",
+              "description": "NOTE: if both amount and cw20_payment are empty then use default by\nCollection custom amount specified by service agent for claim approval",
+              "label": "repeated",
+              "type": "Coin",
+              "longType": "cosmos.base.v1beta1.Coin",
+              "fullType": "cosmos.base.v1beta1.Coin",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "cw20_payment",
+              "description": "NOTE: if both amount and cw20 amount are empty then use default by\nCollection custom cw20 payments specified by service agent for claim\napproval",
+              "label": "repeated",
+              "type": "CW20Payment",
+              "longType": "CW20Payment",
+              "fullType": "ixo.claims.v1beta1.CW20Payment",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
             }
           ]
         },
@@ -6689,6 +7403,65 @@
           "extensions": [],
           "fields": []
         },
+        {
+          "name": "MsgUpdateCollectionIntents",
+          "longName": "MsgUpdateCollectionIntents",
+          "fullName": "ixo.claims.v1beta1.MsgUpdateCollectionIntents",
+          "description": "",
+          "hasExtensions": false,
+          "hasFields": true,
+          "hasOneofs": false,
+          "extensions": [],
+          "fields": [
+            {
+              "name": "collection_id",
+              "description": "collection_id indicates which Collection to update",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "intents",
+              "description": "intents is the option for intents for this collection (allow, deny,\nrequired)",
+              "label": "",
+              "type": "CollectionIntentOptions",
+              "longType": "CollectionIntentOptions",
+              "fullType": "ixo.claims.v1beta1.CollectionIntentOptions",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "admin_address",
+              "description": "admin address used to sign this message, validated against Collection Admin",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            }
+          ]
+        },
+        {
+          "name": "MsgUpdateCollectionIntentsResponse",
+          "longName": "MsgUpdateCollectionIntentsResponse",
+          "fullName": "ixo.claims.v1beta1.MsgUpdateCollectionIntentsResponse",
+          "description": "",
+          "hasExtensions": false,
+          "hasFields": false,
+          "hasOneofs": false,
+          "extensions": [],
+          "fields": []
+        },
         {
           "name": "MsgUpdateCollectionPayments",
           "longName": "MsgUpdateCollectionPayments",
@@ -7053,6 +7826,30 @@
               "responseLongType": "MsgUpdateCollectionPaymentsResponse",
               "responseFullType": "ixo.claims.v1beta1.MsgUpdateCollectionPaymentsResponse",
               "responseStreaming": false
+            },
+            {
+              "name": "UpdateCollectionIntents",
+              "description": "",
+              "requestType": "MsgUpdateCollectionIntents",
+              "requestLongType": "MsgUpdateCollectionIntents",
+              "requestFullType": "ixo.claims.v1beta1.MsgUpdateCollectionIntents",
+              "requestStreaming": false,
+              "responseType": "MsgUpdateCollectionIntentsResponse",
+              "responseLongType": "MsgUpdateCollectionIntentsResponse",
+              "responseFullType": "ixo.claims.v1beta1.MsgUpdateCollectionIntentsResponse",
+              "responseStreaming": false
+            },
+            {
+              "name": "ClaimIntent",
+              "description": "",
+              "requestType": "MsgClaimIntent",
+              "requestLongType": "MsgClaimIntent",
+              "requestFullType": "ixo.claims.v1beta1.MsgClaimIntent",
+              "requestStreaming": false,
+              "responseType": "MsgClaimIntentResponse",
+              "responseLongType": "MsgClaimIntentResponse",
+              "responseFullType": "ixo.claims.v1beta1.MsgClaimIntentResponse",
+              "responseStreaming": false
             }
           ]
         }
diff --git a/docs/core/proto-docs.md b/docs/core/proto-docs.md
index 165bd2dc..4bda5960 100755
--- a/docs/core/proto-docs.md
+++ b/docs/core/proto-docs.md
@@ -99,12 +99,15 @@
     - [Dispute](#ixo.claims.v1beta1.Dispute)
     - [DisputeData](#ixo.claims.v1beta1.DisputeData)
     - [Evaluation](#ixo.claims.v1beta1.Evaluation)
+    - [Intent](#ixo.claims.v1beta1.Intent)
     - [Params](#ixo.claims.v1beta1.Params)
     - [Payment](#ixo.claims.v1beta1.Payment)
     - [Payments](#ixo.claims.v1beta1.Payments)
   
+    - [CollectionIntentOptions](#ixo.claims.v1beta1.CollectionIntentOptions)
     - [CollectionState](#ixo.claims.v1beta1.CollectionState)
     - [EvaluationStatus](#ixo.claims.v1beta1.EvaluationStatus)
+    - [IntentStatus](#ixo.claims.v1beta1.IntentStatus)
     - [PaymentStatus](#ixo.claims.v1beta1.PaymentStatus)
     - [PaymentType](#ixo.claims.v1beta1.PaymentType)
   
@@ -123,6 +126,8 @@
     - [ClaimUpdatedEvent](#ixo.claims.v1beta1.ClaimUpdatedEvent)
     - [CollectionCreatedEvent](#ixo.claims.v1beta1.CollectionCreatedEvent)
     - [CollectionUpdatedEvent](#ixo.claims.v1beta1.CollectionUpdatedEvent)
+    - [IntentSubmittedEvent](#ixo.claims.v1beta1.IntentSubmittedEvent)
+    - [IntentUpdatedEvent](#ixo.claims.v1beta1.IntentUpdatedEvent)
     - [PaymentWithdrawCreatedEvent](#ixo.claims.v1beta1.PaymentWithdrawCreatedEvent)
     - [PaymentWithdrawnEvent](#ixo.claims.v1beta1.PaymentWithdrawnEvent)
   
@@ -142,12 +147,18 @@
     - [QueryDisputeListResponse](#ixo.claims.v1beta1.QueryDisputeListResponse)
     - [QueryDisputeRequest](#ixo.claims.v1beta1.QueryDisputeRequest)
     - [QueryDisputeResponse](#ixo.claims.v1beta1.QueryDisputeResponse)
+    - [QueryIntentListRequest](#ixo.claims.v1beta1.QueryIntentListRequest)
+    - [QueryIntentListResponse](#ixo.claims.v1beta1.QueryIntentListResponse)
+    - [QueryIntentRequest](#ixo.claims.v1beta1.QueryIntentRequest)
+    - [QueryIntentResponse](#ixo.claims.v1beta1.QueryIntentResponse)
     - [QueryParamsRequest](#ixo.claims.v1beta1.QueryParamsRequest)
     - [QueryParamsResponse](#ixo.claims.v1beta1.QueryParamsResponse)
   
     - [Query](#ixo.claims.v1beta1.Query)
   
 - [ixo/claims/v1beta1/tx.proto](#ixo/claims/v1beta1/tx.proto)
+    - [MsgClaimIntent](#ixo.claims.v1beta1.MsgClaimIntent)
+    - [MsgClaimIntentResponse](#ixo.claims.v1beta1.MsgClaimIntentResponse)
     - [MsgCreateCollection](#ixo.claims.v1beta1.MsgCreateCollection)
     - [MsgCreateCollectionResponse](#ixo.claims.v1beta1.MsgCreateCollectionResponse)
     - [MsgDisputeClaim](#ixo.claims.v1beta1.MsgDisputeClaim)
@@ -158,6 +169,8 @@
     - [MsgSubmitClaimResponse](#ixo.claims.v1beta1.MsgSubmitClaimResponse)
     - [MsgUpdateCollectionDates](#ixo.claims.v1beta1.MsgUpdateCollectionDates)
     - [MsgUpdateCollectionDatesResponse](#ixo.claims.v1beta1.MsgUpdateCollectionDatesResponse)
+    - [MsgUpdateCollectionIntents](#ixo.claims.v1beta1.MsgUpdateCollectionIntents)
+    - [MsgUpdateCollectionIntentsResponse](#ixo.claims.v1beta1.MsgUpdateCollectionIntentsResponse)
     - [MsgUpdateCollectionPayments](#ixo.claims.v1beta1.MsgUpdateCollectionPayments)
     - [MsgUpdateCollectionPaymentsResponse](#ixo.claims.v1beta1.MsgUpdateCollectionPaymentsResponse)
     - [MsgUpdateCollectionState](#ixo.claims.v1beta1.MsgUpdateCollectionState)
@@ -1810,7 +1823,10 @@ Msg defines the bonds Msg service.
 | submission_date | [google.protobuf.Timestamp](#google.protobuf.Timestamp) |  | submissionDate is the date and time that the claim was submitted on-chain |
 | claim_id | [string](#string) |  | claimID is the unique identifier of the claim in the cid hash format |
 | evaluation | [Evaluation](#ixo.claims.v1beta1.Evaluation) |  | evaluation is the result of one or more claim evaluations |
-| payments_status | [ClaimPayments](#ixo.claims.v1beta1.ClaimPayments) |  |  |
+| payments_status | [ClaimPayments](#ixo.claims.v1beta1.ClaimPayments) |  | payments_status is the status of the payments for the claim |
+| use_intent | [bool](#bool) |  | intent_id is the id of the intent for this claim, if any |
+| amount | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | repeated | NOTE: if both amount and cw20 amount are empty then use default by Collection custom amount specified by service agent for claim approval |
+| cw20_payment | [CW20Payment](#ixo.claims.v1beta1.CW20Payment) | repeated | NOTE: if both amount and cw20 amount are empty then use default by Collection custom cw20 payments specified by service agent for claim approval |
 
 
 
@@ -1859,6 +1875,8 @@ Msg defines the bonds Msg service.
 | payments | [Payments](#ixo.claims.v1beta1.Payments) |  | payments is the amount paid for claim submission, evaluation, approval, or rejection |
 | signer | [string](#string) |  | signer address |
 | invalidated | [uint64](#uint64) |  | invalidated is the number of claims that have been evaluated as invalid (internally calculated) |
+| escrow_account | [string](#string) |  | escrow_account is the escrow account address for this collection created at collection creation, current purpose is to transfer payments to escrow account for GUARANTEED payments through intents |
+| intents | [CollectionIntentOptions](#ixo.claims.v1beta1.CollectionIntentOptions) |  | intents is the option for intents for this collection (allow, deny, required) |
 
 
 
@@ -1934,8 +1952,34 @@ Msg defines the bonds Msg service.
 | reason | [uint32](#uint32) |  | reason is the code expressed as an integer, for why the evaluation result was given (codes defined by evaluator) |
 | verification_proof | [string](#string) |  | verificationProof is the cid of the evaluation Verfiable Credential |
 | evaluation_date | [google.protobuf.Timestamp](#google.protobuf.Timestamp) |  | evaluationDate is the date and time that the claim evaluation was submitted on-chain |
-| amount | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | repeated | custom amount specified by evaluator for claim approval, if empty list then use default by Collection |
-| cw20_payment | [CW20Payment](#ixo.claims.v1beta1.CW20Payment) | repeated | custom cw20 payments specified by evaluator for claim approval, if empty list then use default by Collection |
+| amount | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | repeated | if both amount and cw20 amount are empty then use default by Collection custom amount specified by evaluator for claim approval |
+| cw20_payment | [CW20Payment](#ixo.claims.v1beta1.CW20Payment) | repeated | custom cw20 payments specified by evaluator for claim approval |
+
+
+
+
+
+
+<a name="ixo.claims.v1beta1.Intent"></a>
+
+### Intent
+Intent defines the structure for a service agent&#39;s claim intent.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| id | [string](#string) |  | id is the incremented internal id for the intent |
+| agent_did | [string](#string) |  | The service agent&#39;s DID (Decentralized Identifier). |
+| agent_address | [string](#string) |  | The service agent&#39;s address. |
+| collection_id | [string](#string) |  | The id of the collection this intent is linked to. |
+| claim_id | [string](#string) |  | claim_id (optional, set when claim is submitted) |
+| created_at | [google.protobuf.Timestamp](#google.protobuf.Timestamp) |  | The time the intent was created. |
+| expire_at | [google.protobuf.Timestamp](#google.protobuf.Timestamp) |  | Timeout period for the intent. If the claim is not submitted by this time, the intent expires. |
+| status | [IntentStatus](#ixo.claims.v1beta1.IntentStatus) |  | Status of the intent (e.g., &#34;ACTIVE&#34; or &#34;FULFILLED&#34;). |
+| amount | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | repeated | The payment amount the agent intends to claim, if any. |
+| cw20_payment | [CW20Payment](#ixo.claims.v1beta1.CW20Payment) | repeated | The CW20Payment amount the agent intends to claim, if any. |
+| from_address | [string](#string) |  | the address the escrow payment came from |
+| escrow_address | [string](#string) |  | the escrow account address |
 
 
 
@@ -1954,6 +1998,7 @@ Msg defines the bonds Msg service.
 | ixo_account | [string](#string) |  |  |
 | network_fee_percentage | [string](#string) |  |  |
 | node_fee_percentage | [string](#string) |  |  |
+| intent_sequence | [uint64](#uint64) |  |  |
 
 
 
@@ -1973,6 +2018,7 @@ Msg defines the bonds Msg service.
 | contract_1155_payment | [Contract1155Payment](#ixo.claims.v1beta1.Contract1155Payment) |  | if empty(nil) then no contract payment, not allowed for Evaluation Payment |
 | timeout_ns | [google.protobuf.Duration](#google.protobuf.Duration) |  | timeout after claim/evaluation to create authZ for payment, if 0 then immediate direct payment |
 | cw20_payment | [CW20Payment](#ixo.claims.v1beta1.CW20Payment) | repeated | cw20 payments, can be empty or multiple |
+| is_oracle_payment | [bool](#bool) |  | boolean to indicate if the payment is for oracle payments, aka it will go through network fees split NOTE: if true the payment can only have amount values(Native coins), no cw20 payments allowed then |
 
 
 
@@ -1999,6 +2045,19 @@ Msg defines the bonds Msg service.
  
 
 
+<a name="ixo.claims.v1beta1.CollectionIntentOptions"></a>
+
+### CollectionIntentOptions
+
+
+| Name | Number | Description |
+| ---- | ------ | ----------- |
+| ALLOW | 0 | Allow: Intents can be made for claims, but claims can also be made without intents. |
+| DENY | 1 | Deny: Intents cannot be made for claims for the collection. |
+| REQUIRED | 2 | Required: Claims cannot be made without an associated intent. An intent is mandatory before a claim can be submitted. |
+
+
+
 <a name="ixo.claims.v1beta1.CollectionState"></a>
 
 ### CollectionState
@@ -2027,6 +2086,19 @@ Msg defines the bonds Msg service.
 
 
 
+<a name="ixo.claims.v1beta1.IntentStatus"></a>
+
+### IntentStatus
+
+
+| Name | Number | Description |
+| ---- | ------ | ----------- |
+| ACTIVE | 0 | Active: Intent is created and active, payments have been transferred to escrow if there is any |
+| FULFILLED | 1 | Fulfilled: Intent is fulfilled, was used to create a claim and funds will be released on claim APPROVAL, or funds will be reverted on claim REJECTION or DISPUTE |
+| EXPIRED | 2 | Expired: Intent has expired, payments have been transferred back out of escrow |
+
+
+
 <a name="ixo.claims.v1beta1.PaymentStatus"></a>
 
 ### PaymentStatus
@@ -2035,12 +2107,12 @@ Msg defines the bonds Msg service.
 | Name | Number | Description |
 | ---- | ------ | ----------- |
 | NO_PAYMENT | 0 |  |
-| PROMISED | 1 | agent is contracted to receive payment |
-| AUTHORIZED | 2 | authz set up, no guarantee |
-| GUARANTEED | 3 | escrow set up with funds blocked |
-| PAID | 4 |  |
-| FAILED | 5 |  |
-| DISPUTED_PAYMENT | 6 |  |
+| PROMISED | 1 | Promised: Agent is contracted to receive payment |
+| AUTHORIZED | 2 | Authorized: Authz set up, no guarantee |
+| GUARANTEED | 3 | Guaranteed: Escrow set up with funds blocked |
+| PAID | 4 | Paid: Funds have been paid |
+| FAILED | 5 | Failed: Payment failed, most probably due to insufficient funds |
+| DISPUTED_PAYMENT | 6 | DisputedPayment: Payment disputed |
 
 
 
@@ -2134,6 +2206,9 @@ Msg defines the bonds Msg service.
 | ----- | ---- | ----- | ----------- |
 | collection_id | [string](#string) |  | collection_id indicates to which Collection this claim belongs |
 | agent_quota | [uint64](#uint64) |  |  |
+| max_amount | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | repeated | custom max_amount allowed to be specified by service agent for claim approval, if empty then no custom amount is allowed |
+| max_cw20_payment | [CW20Payment](#ixo.claims.v1beta1.CW20Payment) | repeated | custom max_cw20_payment allowed to be specified by service agent for claim approval, if empty then no custom amount is allowed |
+| intent_duration_ns | [google.protobuf.Duration](#google.protobuf.Duration) |  | intent_duration_ns is the duration for which the intent is active, after which it will expire (in nanoseconds) |
 
 
 
@@ -2285,6 +2360,36 @@ CollectionUpdatedEvent is an event triggered on a Collection update
 
 
 
+<a name="ixo.claims.v1beta1.IntentSubmittedEvent"></a>
+
+### IntentSubmittedEvent
+IntentSubmittedEvent is an event triggered on an Intent submission
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| intent | [Intent](#ixo.claims.v1beta1.Intent) |  |  |
+
+
+
+
+
+
+<a name="ixo.claims.v1beta1.IntentUpdatedEvent"></a>
+
+### IntentUpdatedEvent
+IntentUpdatedEvent is an event triggered on an Intent update
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| intent | [Intent](#ixo.claims.v1beta1.Intent) |  |  |
+
+
+
+
+
+
 <a name="ixo.claims.v1beta1.PaymentWithdrawCreatedEvent"></a>
 
 ### PaymentWithdrawCreatedEvent
@@ -2343,6 +2448,7 @@ GenesisState defines the claims module&#39;s genesis state.
 | collections | [Collection](#ixo.claims.v1beta1.Collection) | repeated |  |
 | claims | [Claim](#ixo.claims.v1beta1.Claim) | repeated |  |
 | disputes | [Dispute](#ixo.claims.v1beta1.Dispute) | repeated |  |
+| intents | [Intent](#ixo.claims.v1beta1.Intent) | repeated |  |
 
 
 
@@ -2548,6 +2654,69 @@ GenesisState defines the claims module&#39;s genesis state.
 
 
 
+<a name="ixo.claims.v1beta1.QueryIntentListRequest"></a>
+
+### QueryIntentListRequest
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| pagination | [cosmos.base.query.v1beta1.PageRequest](#cosmos.base.query.v1beta1.PageRequest) |  |  |
+
+
+
+
+
+
+<a name="ixo.claims.v1beta1.QueryIntentListResponse"></a>
+
+### QueryIntentListResponse
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| intents | [Intent](#ixo.claims.v1beta1.Intent) | repeated |  |
+| pagination | [cosmos.base.query.v1beta1.PageResponse](#cosmos.base.query.v1beta1.PageResponse) |  |  |
+
+
+
+
+
+
+<a name="ixo.claims.v1beta1.QueryIntentRequest"></a>
+
+### QueryIntentRequest
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| id | [string](#string) |  |  |
+| agentAddress | [string](#string) |  |  |
+| collectionId | [string](#string) |  |  |
+
+
+
+
+
+
+<a name="ixo.claims.v1beta1.QueryIntentResponse"></a>
+
+### QueryIntentResponse
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| intent | [Intent](#ixo.claims.v1beta1.Intent) |  |  |
+
+
+
+
+
+
 <a name="ixo.claims.v1beta1.QueryParamsRequest"></a>
 
 ### QueryParamsRequest
@@ -2593,6 +2762,8 @@ Query defines the gRPC querier service.
 | ClaimList | [QueryClaimListRequest](#ixo.claims.v1beta1.QueryClaimListRequest) | [QueryClaimListResponse](#ixo.claims.v1beta1.QueryClaimListResponse) |  |
 | Dispute | [QueryDisputeRequest](#ixo.claims.v1beta1.QueryDisputeRequest) | [QueryDisputeResponse](#ixo.claims.v1beta1.QueryDisputeResponse) |  |
 | DisputeList | [QueryDisputeListRequest](#ixo.claims.v1beta1.QueryDisputeListRequest) | [QueryDisputeListResponse](#ixo.claims.v1beta1.QueryDisputeListResponse) |  |
+| Intent | [QueryIntentRequest](#ixo.claims.v1beta1.QueryIntentRequest) | [QueryIntentResponse](#ixo.claims.v1beta1.QueryIntentResponse) |  |
+| IntentList | [QueryIntentListRequest](#ixo.claims.v1beta1.QueryIntentListRequest) | [QueryIntentListResponse](#ixo.claims.v1beta1.QueryIntentListResponse) |  |
 
  
 
@@ -2605,6 +2776,41 @@ Query defines the gRPC querier service.
 
 
 
+<a name="ixo.claims.v1beta1.MsgClaimIntent"></a>
+
+### MsgClaimIntent
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| agent_did | [string](#string) |  | The service agent&#39;s DID (Decentralized Identifier). |
+| agent_address | [string](#string) |  | The service agent&#39;s address (who submits this message). |
+| collection_id | [string](#string) |  | The id of the collection this intent is linked to. |
+| amount | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | repeated | NOTE: if both amount and cw20 amount are empty then default by Collection is used (APPROVAL payment). The desired claim amount, if any. |
+| cw20_payment | [CW20Payment](#ixo.claims.v1beta1.CW20Payment) | repeated | NOTE: if both amount and cw20 amount are empty then default by Collection is used (APPROVAL payment). The custom CW20 payment, if any. |
+
+
+
+
+
+
+<a name="ixo.claims.v1beta1.MsgClaimIntentResponse"></a>
+
+### MsgClaimIntentResponse
+MsgClaimIntentResponse defines the response after submitting an intent.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| intent_id | [string](#string) |  | Resulting intent id. |
+| expire_at | [google.protobuf.Timestamp](#google.protobuf.Timestamp) |  | Timeout period for the intent. If the claim is not submitted by this time, the intent expires. |
+
+
+
+
+
+
 <a name="ixo.claims.v1beta1.MsgCreateCollection"></a>
 
 ### MsgCreateCollection
@@ -2621,6 +2827,7 @@ Query defines the gRPC querier service.
 | quota | [uint64](#uint64) |  | quota is the maximum number of claims that may be submitted, 0 is unlimited |
 | state | [CollectionState](#ixo.claims.v1beta1.CollectionState) |  | state is the current state of this Collection (open, paused, closed) |
 | payments | [Payments](#ixo.claims.v1beta1.Payments) |  | payments is the amount paid for claim submission, evaluation, approval, or rejection |
+| intents | [CollectionIntentOptions](#ixo.claims.v1beta1.CollectionIntentOptions) |  | intents is the option for intents for this collection (allow, deny, required) |
 
 
 
@@ -2684,8 +2891,8 @@ Collection entity, or have authz cap, aka is agent
 | status | [EvaluationStatus](#ixo.claims.v1beta1.EvaluationStatus) |  | status is the evaluation status expressed as an integer (2=approved, 3=rejected, ...) |
 | reason | [uint32](#uint32) |  | reason is the code expressed as an integer, for why the evaluation result was given (codes defined by evaluator) |
 | verification_proof | [string](#string) |  | verificationProof is the cid of the evaluation Verfiable Credential |
-| amount | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | repeated | custom amount specified by evaluator for claim approval, if empty list then use default by Collection |
-| cw20_payment | [CW20Payment](#ixo.claims.v1beta1.CW20Payment) | repeated | custom cw20 payments specified by evaluator for claim approval, if empty list then use default by Collection |
+| amount | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | repeated | NOTE: if both amount and cw20 amount are empty then use collection default custom amount specified by evaluator for claim approval |
+| cw20_payment | [CW20Payment](#ixo.claims.v1beta1.CW20Payment) | repeated | NOTE: if both amount and cw20 amount are empty then use collection default custom cw20 payments specified by evaluator for claim approval |
 
 
 
@@ -2715,6 +2922,9 @@ Collection entity, or have authz cap, aka is agent
 | agent_did | [string](#string) |  | agent is the DID of the agent submitting the claim |
 | agent_address | [string](#string) |  |  |
 | admin_address | [string](#string) |  | admin address used to sign this message, validated against Collection Admin |
+| use_intent | [bool](#bool) |  | use_intent is the option for using intent for this claim if it exists and is active. NOTE: if use_intent is true then amount and cw20 amount are ignored and overriden with intent amounts. NOTE: if use_intent is true and there is no active intent then will error |
+| amount | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | repeated | NOTE: if both amount and cw20_payment are empty then use default by Collection custom amount specified by service agent for claim approval |
+| cw20_payment | [CW20Payment](#ixo.claims.v1beta1.CW20Payment) | repeated | NOTE: if both amount and cw20 amount are empty then use default by Collection custom cw20 payments specified by service agent for claim approval |
 
 
 
@@ -2759,6 +2969,33 @@ Collection entity, or have authz cap, aka is agent
 
 
 
+<a name="ixo.claims.v1beta1.MsgUpdateCollectionIntents"></a>
+
+### MsgUpdateCollectionIntents
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| collection_id | [string](#string) |  | collection_id indicates which Collection to update |
+| intents | [CollectionIntentOptions](#ixo.claims.v1beta1.CollectionIntentOptions) |  | intents is the option for intents for this collection (allow, deny, required) |
+| admin_address | [string](#string) |  | admin address used to sign this message, validated against Collection Admin |
+
+
+
+
+
+
+<a name="ixo.claims.v1beta1.MsgUpdateCollectionIntentsResponse"></a>
+
+### MsgUpdateCollectionIntentsResponse
+
+
+
+
+
+
+
 <a name="ixo.claims.v1beta1.MsgUpdateCollectionPayments"></a>
 
 ### MsgUpdateCollectionPayments
@@ -2868,6 +3105,8 @@ Msg defines the Msg service.
 | UpdateCollectionState | [MsgUpdateCollectionState](#ixo.claims.v1beta1.MsgUpdateCollectionState) | [MsgUpdateCollectionStateResponse](#ixo.claims.v1beta1.MsgUpdateCollectionStateResponse) |  |
 | UpdateCollectionDates | [MsgUpdateCollectionDates](#ixo.claims.v1beta1.MsgUpdateCollectionDates) | [MsgUpdateCollectionDatesResponse](#ixo.claims.v1beta1.MsgUpdateCollectionDatesResponse) |  |
 | UpdateCollectionPayments | [MsgUpdateCollectionPayments](#ixo.claims.v1beta1.MsgUpdateCollectionPayments) | [MsgUpdateCollectionPaymentsResponse](#ixo.claims.v1beta1.MsgUpdateCollectionPaymentsResponse) |  |
+| UpdateCollectionIntents | [MsgUpdateCollectionIntents](#ixo.claims.v1beta1.MsgUpdateCollectionIntents) | [MsgUpdateCollectionIntentsResponse](#ixo.claims.v1beta1.MsgUpdateCollectionIntentsResponse) |  |
+| ClaimIntent | [MsgClaimIntent](#ixo.claims.v1beta1.MsgClaimIntent) | [MsgClaimIntentResponse](#ixo.claims.v1beta1.MsgClaimIntentResponse) |  |
 
  
 
diff --git a/docs/swagger-ui/swagger.yaml b/docs/swagger-ui/swagger.yaml
index 6123730d..4a68ed56 100644
--- a/docs/swagger-ui/swagger.yaml
+++ b/docs/swagger-ui/swagger.yaml
@@ -50740,10 +50740,11 @@ paths:
 
                               signatures required by gogoproto.
                           title: >-
-                            custom amount specified by evaluator for claim
-                            approval, if empty list then
+                            if both amount and cw20 amount are empty then use
+                            default by Collection
 
-                            use default by Collection
+                            custom amount specified by evaluator for claim
+                            approval
                         cw20_payment:
                           type: array
                           items:
@@ -50761,10 +50762,11 @@ paths:
                                   uint64(max 18446744073709551615)
                           title: >-
                             custom cw20 payments specified by evaluator for
-                            claim approval, if empty
-
-                            list then use default by Collection
+                            claim approval
                     payments_status:
+                      title: >-
+                        payments_status is the status of the payments for the
+                        claim
                       type: object
                       properties:
                         submission:
@@ -50778,6 +50780,14 @@ paths:
                             - FAILED
                             - DISPUTED_PAYMENT
                           default: NO_PAYMENT
+                          title: >-
+                            - PROMISED: Promised: Agent is contracted to receive
+                            payment
+                             - AUTHORIZED: Authorized: Authz set up, no guarantee
+                             - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+                             - PAID: Paid: Funds have been paid
+                             - FAILED: Failed: Payment failed, most probably due to insufficient funds
+                             - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
                         evaluation:
                           type: string
                           enum:
@@ -50789,6 +50799,14 @@ paths:
                             - FAILED
                             - DISPUTED_PAYMENT
                           default: NO_PAYMENT
+                          title: >-
+                            - PROMISED: Promised: Agent is contracted to receive
+                            payment
+                             - AUTHORIZED: Authorized: Authz set up, no guarantee
+                             - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+                             - PAID: Paid: Funds have been paid
+                             - FAILED: Failed: Payment failed, most probably due to insufficient funds
+                             - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
                         approval:
                           type: string
                           enum:
@@ -50800,6 +50818,14 @@ paths:
                             - FAILED
                             - DISPUTED_PAYMENT
                           default: NO_PAYMENT
+                          title: >-
+                            - PROMISED: Promised: Agent is contracted to receive
+                            payment
+                             - AUTHORIZED: Authorized: Authz set up, no guarantee
+                             - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+                             - PAID: Paid: Funds have been paid
+                             - FAILED: Failed: Payment failed, most probably due to insufficient funds
+                             - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
                         rejection:
                           type: string
                           enum:
@@ -50811,6 +50837,64 @@ paths:
                             - FAILED
                             - DISPUTED_PAYMENT
                           default: NO_PAYMENT
+                          title: >-
+                            - PROMISED: Promised: Agent is contracted to receive
+                            payment
+                             - AUTHORIZED: Authorized: Authz set up, no guarantee
+                             - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+                             - PAID: Paid: Funds have been paid
+                             - FAILED: Failed: Payment failed, most probably due to insufficient funds
+                             - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
+                    use_intent:
+                      type: boolean
+                      title: intent_id is the id of the intent for this claim, if any
+                    amount:
+                      type: array
+                      items:
+                        type: object
+                        properties:
+                          denom:
+                            type: string
+                          amount:
+                            type: string
+                        description: >-
+                          Coin defines a token with a denomination and an
+                          amount.
+
+
+                          NOTE: The amount field is an Int which implements the
+                          custom method
+
+                          signatures required by gogoproto.
+                      title: >-
+                        NOTE: if both amount and cw20 amount are empty then use
+                        default by
+
+                        Collection custom amount specified by service agent for
+                        claim approval
+                    cw20_payment:
+                      type: array
+                      items:
+                        type: object
+                        properties:
+                          address:
+                            type: string
+                          amount:
+                            type: string
+                            format: uint64
+                            title: >-
+                              chose uint64 for now as amounts should be small
+                              enough to fit in a
+
+                              uint64(max 18446744073709551615)
+                      title: >-
+                        NOTE: if both amount and cw20 amount are empty then use
+                        default by
+
+                        Collection custom cw20 payments specified by service
+                        agent for claim
+
+                        approval
               pagination:
                 type: object
                 properties:
@@ -51033,10 +51117,11 @@ paths:
 
                             signatures required by gogoproto.
                         title: >-
-                          custom amount specified by evaluator for claim
-                          approval, if empty list then
+                          if both amount and cw20 amount are empty then use
+                          default by Collection
 
-                          use default by Collection
+                          custom amount specified by evaluator for claim
+                          approval
                       cw20_payment:
                         type: array
                         items:
@@ -51054,10 +51139,11 @@ paths:
                                 uint64(max 18446744073709551615)
                         title: >-
                           custom cw20 payments specified by evaluator for claim
-                          approval, if empty
-
-                          list then use default by Collection
+                          approval
                   payments_status:
+                    title: >-
+                      payments_status is the status of the payments for the
+                      claim
                     type: object
                     properties:
                       submission:
@@ -51071,6 +51157,14 @@ paths:
                           - FAILED
                           - DISPUTED_PAYMENT
                         default: NO_PAYMENT
+                        title: >-
+                          - PROMISED: Promised: Agent is contracted to receive
+                          payment
+                           - AUTHORIZED: Authorized: Authz set up, no guarantee
+                           - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+                           - PAID: Paid: Funds have been paid
+                           - FAILED: Failed: Payment failed, most probably due to insufficient funds
+                           - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
                       evaluation:
                         type: string
                         enum:
@@ -51082,6 +51176,14 @@ paths:
                           - FAILED
                           - DISPUTED_PAYMENT
                         default: NO_PAYMENT
+                        title: >-
+                          - PROMISED: Promised: Agent is contracted to receive
+                          payment
+                           - AUTHORIZED: Authorized: Authz set up, no guarantee
+                           - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+                           - PAID: Paid: Funds have been paid
+                           - FAILED: Failed: Payment failed, most probably due to insufficient funds
+                           - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
                       approval:
                         type: string
                         enum:
@@ -51093,6 +51195,14 @@ paths:
                           - FAILED
                           - DISPUTED_PAYMENT
                         default: NO_PAYMENT
+                        title: >-
+                          - PROMISED: Promised: Agent is contracted to receive
+                          payment
+                           - AUTHORIZED: Authorized: Authz set up, no guarantee
+                           - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+                           - PAID: Paid: Funds have been paid
+                           - FAILED: Failed: Payment failed, most probably due to insufficient funds
+                           - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
                       rejection:
                         type: string
                         enum:
@@ -51104,6 +51214,63 @@ paths:
                           - FAILED
                           - DISPUTED_PAYMENT
                         default: NO_PAYMENT
+                        title: >-
+                          - PROMISED: Promised: Agent is contracted to receive
+                          payment
+                           - AUTHORIZED: Authorized: Authz set up, no guarantee
+                           - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+                           - PAID: Paid: Funds have been paid
+                           - FAILED: Failed: Payment failed, most probably due to insufficient funds
+                           - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
+                  use_intent:
+                    type: boolean
+                    title: intent_id is the id of the intent for this claim, if any
+                  amount:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        denom:
+                          type: string
+                        amount:
+                          type: string
+                      description: >-
+                        Coin defines a token with a denomination and an amount.
+
+
+                        NOTE: The amount field is an Int which implements the
+                        custom method
+
+                        signatures required by gogoproto.
+                    title: >-
+                      NOTE: if both amount and cw20 amount are empty then use
+                      default by
+
+                      Collection custom amount specified by service agent for
+                      claim approval
+                  cw20_payment:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        address:
+                          type: string
+                        amount:
+                          type: string
+                          format: uint64
+                          title: >-
+                            chose uint64 for now as amounts should be small
+                            enough to fit in a
+
+                            uint64(max 18446744073709551615)
+                    title: >-
+                      NOTE: if both amount and cw20 amount are empty then use
+                      default by
+
+                      Collection custom cw20 payments specified by service agent
+                      for claim
+
+                      approval
         default:
           description: An unexpected error response.
           schema:
@@ -51156,6 +51323,9 @@ paths:
                     type: string
                   node_fee_percentage:
                     type: string
+                  intent_sequence:
+                    type: string
+                    format: uint64
         default:
           description: An unexpected error response.
           schema:
@@ -51352,6 +51522,17 @@ paths:
 
                                       uint64(max 18446744073709551615)
                               title: cw20 payments, can be empty or multiple
+                            is_oracle_payment:
+                              type: boolean
+                              title: >-
+                                boolean to indicate if the payment is for oracle
+                                payments, aka it will go
+
+                                through network fees split NOTE: if true the
+                                payment can only have amount
+
+                                values(Native coins), no cw20 payments allowed
+                                then
                         evaluation:
                           type: object
                           properties:
@@ -51414,6 +51595,17 @@ paths:
 
                                       uint64(max 18446744073709551615)
                               title: cw20 payments, can be empty or multiple
+                            is_oracle_payment:
+                              type: boolean
+                              title: >-
+                                boolean to indicate if the payment is for oracle
+                                payments, aka it will go
+
+                                through network fees split NOTE: if true the
+                                payment can only have amount
+
+                                values(Native coins), no cw20 payments allowed
+                                then
                         approval:
                           type: object
                           properties:
@@ -51476,6 +51668,17 @@ paths:
 
                                       uint64(max 18446744073709551615)
                               title: cw20 payments, can be empty or multiple
+                            is_oracle_payment:
+                              type: boolean
+                              title: >-
+                                boolean to indicate if the payment is for oracle
+                                payments, aka it will go
+
+                                through network fees split NOTE: if true the
+                                payment can only have amount
+
+                                values(Native coins), no cw20 payments allowed
+                                then
                         rejection:
                           type: object
                           properties:
@@ -51538,6 +51741,17 @@ paths:
 
                                       uint64(max 18446744073709551615)
                               title: cw20 payments, can be empty or multiple
+                            is_oracle_payment:
+                              type: boolean
+                              title: >-
+                                boolean to indicate if the payment is for oracle
+                                payments, aka it will go
+
+                                through network fees split NOTE: if true the
+                                payment can only have amount
+
+                                values(Native coins), no cw20 payments allowed
+                                then
                     signer:
                       type: string
                       title: signer address
@@ -51549,6 +51763,34 @@ paths:
                         evaluated as invalid
 
                         (internally calculated)
+                    escrow_account:
+                      type: string
+                      title: >-
+                        escrow_account is the escrow account address for this
+                        collection created at
+
+                        collection creation, current purpose is to transfer
+                        payments to escrow
+
+                        account for GUARANTEED payments through intents
+                    intents:
+                      title: >-
+                        intents is the option for intents for this collection
+                        (allow, deny,
+
+                        required)
+                      type: string
+                      enum:
+                        - ALLOW
+                        - DENY
+                        - REQUIRED
+                      default: ALLOW
+                      description: |2-
+                         - ALLOW: Allow: Intents can be made for claims, but claims can also be made without
+                        intents.
+                         - DENY: Deny: Intents cannot be made for claims for the collection.
+                         - REQUIRED: Required: Claims cannot be made without an associated intent. An intent is
+                        mandatory before a claim can be submitted.
               pagination:
                 type: object
                 properties:
@@ -51826,6 +52068,17 @@ paths:
 
                                     uint64(max 18446744073709551615)
                             title: cw20 payments, can be empty or multiple
+                          is_oracle_payment:
+                            type: boolean
+                            title: >-
+                              boolean to indicate if the payment is for oracle
+                              payments, aka it will go
+
+                              through network fees split NOTE: if true the
+                              payment can only have amount
+
+                              values(Native coins), no cw20 payments allowed
+                              then
                       evaluation:
                         type: object
                         properties:
@@ -51888,6 +52141,17 @@ paths:
 
                                     uint64(max 18446744073709551615)
                             title: cw20 payments, can be empty or multiple
+                          is_oracle_payment:
+                            type: boolean
+                            title: >-
+                              boolean to indicate if the payment is for oracle
+                              payments, aka it will go
+
+                              through network fees split NOTE: if true the
+                              payment can only have amount
+
+                              values(Native coins), no cw20 payments allowed
+                              then
                       approval:
                         type: object
                         properties:
@@ -51950,6 +52214,17 @@ paths:
 
                                     uint64(max 18446744073709551615)
                             title: cw20 payments, can be empty or multiple
+                          is_oracle_payment:
+                            type: boolean
+                            title: >-
+                              boolean to indicate if the payment is for oracle
+                              payments, aka it will go
+
+                              through network fees split NOTE: if true the
+                              payment can only have amount
+
+                              values(Native coins), no cw20 payments allowed
+                              then
                       rejection:
                         type: object
                         properties:
@@ -52012,6 +52287,17 @@ paths:
 
                                     uint64(max 18446744073709551615)
                             title: cw20 payments, can be empty or multiple
+                          is_oracle_payment:
+                            type: boolean
+                            title: >-
+                              boolean to indicate if the payment is for oracle
+                              payments, aka it will go
+
+                              through network fees split NOTE: if true the
+                              payment can only have amount
+
+                              values(Native coins), no cw20 payments allowed
+                              then
                   signer:
                     type: string
                     title: signer address
@@ -52023,6 +52309,34 @@ paths:
                       evaluated as invalid
 
                       (internally calculated)
+                  escrow_account:
+                    type: string
+                    title: >-
+                      escrow_account is the escrow account address for this
+                      collection created at
+
+                      collection creation, current purpose is to transfer
+                      payments to escrow
+
+                      account for GUARANTEED payments through intents
+                  intents:
+                    title: >-
+                      intents is the option for intents for this collection
+                      (allow, deny,
+
+                      required)
+                    type: string
+                    enum:
+                      - ALLOW
+                      - DENY
+                      - REQUIRED
+                    default: ALLOW
+                    description: |2-
+                       - ALLOW: Allow: Intents can be made for claims, but claims can also be made without
+                      intents.
+                       - DENY: Deny: Intents cannot be made for claims for the collection.
+                       - REQUIRED: Required: Claims cannot be made without an associated intent. An intent is
+                      mandatory before a claim can be submitted.
         default:
           description: An unexpected error response.
           schema:
@@ -52136,117 +52450,472 @@ paths:
                       type: string
                       format: byte
       parameters:
-        - name: pagination.key
-          description: |-
-            key is a value returned in PageResponse.next_key to begin
-            querying the next page most efficiently. Only one of offset or key
-            should be set.
-          in: query
-          required: false
-          type: string
-          format: byte
-        - name: pagination.offset
-          description: >-
-            offset is a numeric offset that can be used when key is unavailable.
-
-            It is less efficient than using key. Only one of offset or key
-            should
-
-            be set.
-          in: query
-          required: false
+        - name: pagination.key
+          description: |-
+            key is a value returned in PageResponse.next_key to begin
+            querying the next page most efficiently. Only one of offset or key
+            should be set.
+          in: query
+          required: false
+          type: string
+          format: byte
+        - name: pagination.offset
+          description: >-
+            offset is a numeric offset that can be used when key is unavailable.
+
+            It is less efficient than using key. Only one of offset or key
+            should
+
+            be set.
+          in: query
+          required: false
+          type: string
+          format: uint64
+        - name: pagination.limit
+          description: >-
+            limit is the total number of results to be returned in the result
+            page.
+
+            If left empty it will default to a value to be set by each app.
+          in: query
+          required: false
+          type: string
+          format: uint64
+        - name: pagination.count_total
+          description: >-
+            count_total is set to true  to indicate that the result set should
+            include
+
+            a count of the total number of items available for pagination in
+            UIs.
+
+            count_total is only respected when offset is used. It is ignored
+            when key
+
+            is set.
+          in: query
+          required: false
+          type: boolean
+        - name: pagination.reverse
+          description: >-
+            reverse is set to true if results are to be returned in the
+            descending order.
+
+
+            Since: cosmos-sdk 0.43
+          in: query
+          required: false
+          type: boolean
+      tags:
+        - Query
+  /ixo/dispute/{proof}:
+    get:
+      operationId: Dispute
+      responses:
+        '200':
+          description: A successful response.
+          schema:
+            type: object
+            properties:
+              dispute:
+                type: object
+                properties:
+                  subject_id:
+                    type: string
+                  type:
+                    type: integer
+                    format: int32
+                    title: type is expressed as an integer, interpreted by the client
+                  data:
+                    type: object
+                    properties:
+                      uri:
+                        type: string
+                      type:
+                        type: string
+                      proof:
+                        type: string
+                      encrypted:
+                        type: boolean
+        default:
+          description: An unexpected error response.
+          schema:
+            type: object
+            properties:
+              error:
+                type: string
+              code:
+                type: integer
+                format: int32
+              message:
+                type: string
+              details:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    type_url:
+                      type: string
+                    value:
+                      type: string
+                      format: byte
+      parameters:
+        - name: proof
+          in: path
+          required: true
+          type: string
+      tags:
+        - Query
+  /ixo/intent:
+    get:
+      operationId: IntentList
+      responses:
+        '200':
+          description: A successful response.
+          schema:
+            type: object
+            properties:
+              intents:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    id:
+                      type: string
+                      title: id is the incremented internal id for the intent
+                    agent_did:
+                      type: string
+                      description: The service agent's DID (Decentralized Identifier).
+                    agent_address:
+                      type: string
+                      description: The service agent's address.
+                    collection_id:
+                      type: string
+                      description: The id of the collection this intent is linked to.
+                    claim_id:
+                      type: string
+                      title: claim_id (optional, set when claim is submitted)
+                    created_at:
+                      type: string
+                      format: date-time
+                      description: The time the intent was created.
+                    expire_at:
+                      type: string
+                      format: date-time
+                      description: >-
+                        Timeout period for the intent. If the claim is not
+                        submitted by this time,
+
+                        the intent expires.
+                    status:
+                      description: Status of the intent (e.g., "ACTIVE" or "FULFILLED").
+                      type: string
+                      enum:
+                        - ACTIVE
+                        - FULFILLED
+                        - EXPIRED
+                      default: ACTIVE
+                      title: >-
+                        - ACTIVE: Active: Intent is created and active, payments
+                        have been transferred to
+
+                        escrow if there is any
+                         - FULFILLED: Fulfilled: Intent is fulfilled, was used to create a claim and funds will
+                        be released on claim APPROVAL, or funds will be reverted
+                        on claim REJECTION
+
+                        or DISPUTE
+                         - EXPIRED: Expired: Intent has expired, payments have been transferred back out of
+                        escrow
+                    amount:
+                      type: array
+                      items:
+                        type: object
+                        properties:
+                          denom:
+                            type: string
+                          amount:
+                            type: string
+                        description: >-
+                          Coin defines a token with a denomination and an
+                          amount.
+
+
+                          NOTE: The amount field is an Int which implements the
+                          custom method
+
+                          signatures required by gogoproto.
+                      description: The payment amount the agent intends to claim, if any.
+                    cw20_payment:
+                      type: array
+                      items:
+                        type: object
+                        properties:
+                          address:
+                            type: string
+                          amount:
+                            type: string
+                            format: uint64
+                            title: >-
+                              chose uint64 for now as amounts should be small
+                              enough to fit in a
+
+                              uint64(max 18446744073709551615)
+                      description: >-
+                        The CW20Payment amount the agent intends to claim, if
+                        any.
+                    from_address:
+                      type: string
+                      title: the address the escrow payment came from
+                    escrow_address:
+                      type: string
+                      title: the escrow account address
+                  description: >-
+                    Intent defines the structure for a service agent's claim
+                    intent.
+              pagination:
+                type: object
+                properties:
+                  next_key:
+                    type: string
+                    format: byte
+                    description: |-
+                      next_key is the key to be passed to PageRequest.key to
+                      query the next page most efficiently. It will be empty if
+                      there are no more results.
+                  total:
+                    type: string
+                    format: uint64
+                    title: >-
+                      total is total number of results available if
+                      PageRequest.count_total
+
+                      was set, its value is undefined otherwise
+                description: >-
+                  PageResponse is to be embedded in gRPC response messages where
+                  the
+
+                  corresponding request message has used PageRequest.
+
+                   message SomeResponse {
+                           repeated Bar results = 1;
+                           PageResponse page = 2;
+                   }
+        default:
+          description: An unexpected error response.
+          schema:
+            type: object
+            properties:
+              error:
+                type: string
+              code:
+                type: integer
+                format: int32
+              message:
+                type: string
+              details:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    type_url:
+                      type: string
+                    value:
+                      type: string
+                      format: byte
+      parameters:
+        - name: pagination.key
+          description: |-
+            key is a value returned in PageResponse.next_key to begin
+            querying the next page most efficiently. Only one of offset or key
+            should be set.
+          in: query
+          required: false
+          type: string
+          format: byte
+        - name: pagination.offset
+          description: >-
+            offset is a numeric offset that can be used when key is unavailable.
+
+            It is less efficient than using key. Only one of offset or key
+            should
+
+            be set.
+          in: query
+          required: false
+          type: string
+          format: uint64
+        - name: pagination.limit
+          description: >-
+            limit is the total number of results to be returned in the result
+            page.
+
+            If left empty it will default to a value to be set by each app.
+          in: query
+          required: false
+          type: string
+          format: uint64
+        - name: pagination.count_total
+          description: >-
+            count_total is set to true  to indicate that the result set should
+            include
+
+            a count of the total number of items available for pagination in
+            UIs.
+
+            count_total is only respected when offset is used. It is ignored
+            when key
+
+            is set.
+          in: query
+          required: false
+          type: boolean
+        - name: pagination.reverse
+          description: >-
+            reverse is set to true if results are to be returned in the
+            descending order.
+
+
+            Since: cosmos-sdk 0.43
+          in: query
+          required: false
+          type: boolean
+      tags:
+        - Query
+  /ixo/intent/{agentAddress}/{collectionId}/{id}:
+    get:
+      operationId: Intent
+      responses:
+        '200':
+          description: A successful response.
+          schema:
+            type: object
+            properties:
+              intent:
+                type: object
+                properties:
+                  id:
+                    type: string
+                    title: id is the incremented internal id for the intent
+                  agent_did:
+                    type: string
+                    description: The service agent's DID (Decentralized Identifier).
+                  agent_address:
+                    type: string
+                    description: The service agent's address.
+                  collection_id:
+                    type: string
+                    description: The id of the collection this intent is linked to.
+                  claim_id:
+                    type: string
+                    title: claim_id (optional, set when claim is submitted)
+                  created_at:
+                    type: string
+                    format: date-time
+                    description: The time the intent was created.
+                  expire_at:
+                    type: string
+                    format: date-time
+                    description: >-
+                      Timeout period for the intent. If the claim is not
+                      submitted by this time,
+
+                      the intent expires.
+                  status:
+                    description: Status of the intent (e.g., "ACTIVE" or "FULFILLED").
+                    type: string
+                    enum:
+                      - ACTIVE
+                      - FULFILLED
+                      - EXPIRED
+                    default: ACTIVE
+                    title: >-
+                      - ACTIVE: Active: Intent is created and active, payments
+                      have been transferred to
+
+                      escrow if there is any
+                       - FULFILLED: Fulfilled: Intent is fulfilled, was used to create a claim and funds will
+                      be released on claim APPROVAL, or funds will be reverted
+                      on claim REJECTION
+
+                      or DISPUTE
+                       - EXPIRED: Expired: Intent has expired, payments have been transferred back out of
+                      escrow
+                  amount:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        denom:
+                          type: string
+                        amount:
+                          type: string
+                      description: >-
+                        Coin defines a token with a denomination and an amount.
+
+
+                        NOTE: The amount field is an Int which implements the
+                        custom method
+
+                        signatures required by gogoproto.
+                    description: The payment amount the agent intends to claim, if any.
+                  cw20_payment:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        address:
+                          type: string
+                        amount:
+                          type: string
+                          format: uint64
+                          title: >-
+                            chose uint64 for now as amounts should be small
+                            enough to fit in a
+
+                            uint64(max 18446744073709551615)
+                    description: The CW20Payment amount the agent intends to claim, if any.
+                  from_address:
+                    type: string
+                    title: the address the escrow payment came from
+                  escrow_address:
+                    type: string
+                    title: the escrow account address
+                description: >-
+                  Intent defines the structure for a service agent's claim
+                  intent.
+        default:
+          description: An unexpected error response.
+          schema:
+            type: object
+            properties:
+              error:
+                type: string
+              code:
+                type: integer
+                format: int32
+              message:
+                type: string
+              details:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    type_url:
+                      type: string
+                    value:
+                      type: string
+                      format: byte
+      parameters:
+        - name: agentAddress
+          in: path
+          required: true
           type: string
-          format: uint64
-        - name: pagination.limit
-          description: >-
-            limit is the total number of results to be returned in the result
-            page.
-
-            If left empty it will default to a value to be set by each app.
-          in: query
-          required: false
+        - name: collectionId
+          in: path
+          required: true
           type: string
-          format: uint64
-        - name: pagination.count_total
-          description: >-
-            count_total is set to true  to indicate that the result set should
-            include
-
-            a count of the total number of items available for pagination in
-            UIs.
-
-            count_total is only respected when offset is used. It is ignored
-            when key
-
-            is set.
-          in: query
-          required: false
-          type: boolean
-        - name: pagination.reverse
-          description: >-
-            reverse is set to true if results are to be returned in the
-            descending order.
-
-
-            Since: cosmos-sdk 0.43
-          in: query
-          required: false
-          type: boolean
-      tags:
-        - Query
-  /ixo/dispute/{proof}:
-    get:
-      operationId: Dispute
-      responses:
-        '200':
-          description: A successful response.
-          schema:
-            type: object
-            properties:
-              dispute:
-                type: object
-                properties:
-                  subject_id:
-                    type: string
-                  type:
-                    type: integer
-                    format: int32
-                    title: type is expressed as an integer, interpreted by the client
-                  data:
-                    type: object
-                    properties:
-                      uri:
-                        type: string
-                      type:
-                        type: string
-                      proof:
-                        type: string
-                      encrypted:
-                        type: boolean
-        default:
-          description: An unexpected error response.
-          schema:
-            type: object
-            properties:
-              error:
-                type: string
-              code:
-                type: integer
-                format: int32
-              message:
-                type: string
-              details:
-                type: array
-                items:
-                  type: object
-                  properties:
-                    type_url:
-                      type: string
-                    value:
-                      type: string
-                      format: byte
-      parameters:
-        - name: proof
+        - name: id
           in: path
           required: true
           type: string
@@ -86769,10 +87438,10 @@ definitions:
 
                 signatures required by gogoproto.
             title: >-
-              custom amount specified by evaluator for claim approval, if empty
-              list then
+              if both amount and cw20 amount are empty then use default by
+              Collection
 
-              use default by Collection
+              custom amount specified by evaluator for claim approval
           cw20_payment:
             type: array
             items:
@@ -86788,12 +87457,9 @@ definitions:
                     fit in a
 
                     uint64(max 18446744073709551615)
-            title: >-
-              custom cw20 payments specified by evaluator for claim approval, if
-              empty
-
-              list then use default by Collection
+            title: custom cw20 payments specified by evaluator for claim approval
       payments_status:
+        title: payments_status is the status of the payments for the claim
         type: object
         properties:
           submission:
@@ -86807,6 +87473,13 @@ definitions:
               - FAILED
               - DISPUTED_PAYMENT
             default: NO_PAYMENT
+            title: |-
+              - PROMISED: Promised: Agent is contracted to receive payment
+               - AUTHORIZED: Authorized: Authz set up, no guarantee
+               - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+               - PAID: Paid: Funds have been paid
+               - FAILED: Failed: Payment failed, most probably due to insufficient funds
+               - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
           evaluation:
             type: string
             enum:
@@ -86818,6 +87491,13 @@ definitions:
               - FAILED
               - DISPUTED_PAYMENT
             default: NO_PAYMENT
+            title: |-
+              - PROMISED: Promised: Agent is contracted to receive payment
+               - AUTHORIZED: Authorized: Authz set up, no guarantee
+               - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+               - PAID: Paid: Funds have been paid
+               - FAILED: Failed: Payment failed, most probably due to insufficient funds
+               - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
           approval:
             type: string
             enum:
@@ -86829,6 +87509,13 @@ definitions:
               - FAILED
               - DISPUTED_PAYMENT
             default: NO_PAYMENT
+            title: |-
+              - PROMISED: Promised: Agent is contracted to receive payment
+               - AUTHORIZED: Authorized: Authz set up, no guarantee
+               - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+               - PAID: Paid: Funds have been paid
+               - FAILED: Failed: Payment failed, most probably due to insufficient funds
+               - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
           rejection:
             type: string
             enum:
@@ -86840,6 +87527,52 @@ definitions:
               - FAILED
               - DISPUTED_PAYMENT
             default: NO_PAYMENT
+            title: |-
+              - PROMISED: Promised: Agent is contracted to receive payment
+               - AUTHORIZED: Authorized: Authz set up, no guarantee
+               - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+               - PAID: Paid: Funds have been paid
+               - FAILED: Failed: Payment failed, most probably due to insufficient funds
+               - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
+      use_intent:
+        type: boolean
+        title: intent_id is the id of the intent for this claim, if any
+      amount:
+        type: array
+        items:
+          type: object
+          properties:
+            denom:
+              type: string
+            amount:
+              type: string
+          description: |-
+            Coin defines a token with a denomination and an amount.
+
+            NOTE: The amount field is an Int which implements the custom method
+            signatures required by gogoproto.
+        title: |-
+          NOTE: if both amount and cw20 amount are empty then use default by
+          Collection custom amount specified by service agent for claim approval
+      cw20_payment:
+        type: array
+        items:
+          type: object
+          properties:
+            address:
+              type: string
+            amount:
+              type: string
+              format: uint64
+              title: >-
+                chose uint64 for now as amounts should be small enough to fit in
+                a
+
+                uint64(max 18446744073709551615)
+        title: |-
+          NOTE: if both amount and cw20 amount are empty then use default by
+          Collection custom cw20 payments specified by service agent for claim
+          approval
   ixo.claims.v1beta1.ClaimPayments:
     type: object
     properties:
@@ -86854,6 +87587,13 @@ definitions:
           - FAILED
           - DISPUTED_PAYMENT
         default: NO_PAYMENT
+        title: |-
+          - PROMISED: Promised: Agent is contracted to receive payment
+           - AUTHORIZED: Authorized: Authz set up, no guarantee
+           - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+           - PAID: Paid: Funds have been paid
+           - FAILED: Failed: Payment failed, most probably due to insufficient funds
+           - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
       evaluation:
         type: string
         enum:
@@ -86865,6 +87605,13 @@ definitions:
           - FAILED
           - DISPUTED_PAYMENT
         default: NO_PAYMENT
+        title: |-
+          - PROMISED: Promised: Agent is contracted to receive payment
+           - AUTHORIZED: Authorized: Authz set up, no guarantee
+           - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+           - PAID: Paid: Funds have been paid
+           - FAILED: Failed: Payment failed, most probably due to insufficient funds
+           - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
       approval:
         type: string
         enum:
@@ -86876,6 +87623,13 @@ definitions:
           - FAILED
           - DISPUTED_PAYMENT
         default: NO_PAYMENT
+        title: |-
+          - PROMISED: Promised: Agent is contracted to receive payment
+           - AUTHORIZED: Authorized: Authz set up, no guarantee
+           - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+           - PAID: Paid: Funds have been paid
+           - FAILED: Failed: Payment failed, most probably due to insufficient funds
+           - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
       rejection:
         type: string
         enum:
@@ -86887,6 +87641,13 @@ definitions:
           - FAILED
           - DISPUTED_PAYMENT
         default: NO_PAYMENT
+        title: |-
+          - PROMISED: Promised: Agent is contracted to receive payment
+           - AUTHORIZED: Authorized: Authz set up, no guarantee
+           - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+           - PAID: Paid: Funds have been paid
+           - FAILED: Failed: Payment failed, most probably due to insufficient funds
+           - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
   ixo.claims.v1beta1.Collection:
     type: object
     properties:
@@ -87031,6 +87792,16 @@ definitions:
 
                         uint64(max 18446744073709551615)
                 title: cw20 payments, can be empty or multiple
+              is_oracle_payment:
+                type: boolean
+                title: >-
+                  boolean to indicate if the payment is for oracle payments, aka
+                  it will go
+
+                  through network fees split NOTE: if true the payment can only
+                  have amount
+
+                  values(Native coins), no cw20 payments allowed then
           evaluation:
             type: object
             properties:
@@ -87092,6 +87863,16 @@ definitions:
 
                         uint64(max 18446744073709551615)
                 title: cw20 payments, can be empty or multiple
+              is_oracle_payment:
+                type: boolean
+                title: >-
+                  boolean to indicate if the payment is for oracle payments, aka
+                  it will go
+
+                  through network fees split NOTE: if true the payment can only
+                  have amount
+
+                  values(Native coins), no cw20 payments allowed then
           approval:
             type: object
             properties:
@@ -87153,6 +87934,16 @@ definitions:
 
                         uint64(max 18446744073709551615)
                 title: cw20 payments, can be empty or multiple
+              is_oracle_payment:
+                type: boolean
+                title: >-
+                  boolean to indicate if the payment is for oracle payments, aka
+                  it will go
+
+                  through network fees split NOTE: if true the payment can only
+                  have amount
+
+                  values(Native coins), no cw20 payments allowed then
           rejection:
             type: object
             properties:
@@ -87214,6 +88005,16 @@ definitions:
 
                         uint64(max 18446744073709551615)
                 title: cw20 payments, can be empty or multiple
+              is_oracle_payment:
+                type: boolean
+                title: >-
+                  boolean to indicate if the payment is for oracle payments, aka
+                  it will go
+
+                  through network fees split NOTE: if true the payment can only
+                  have amount
+
+                  values(Native coins), no cw20 payments allowed then
       signer:
         type: string
         title: signer address
@@ -87225,6 +88026,44 @@ definitions:
           invalid
 
           (internally calculated)
+      escrow_account:
+        type: string
+        title: >-
+          escrow_account is the escrow account address for this collection
+          created at
+
+          collection creation, current purpose is to transfer payments to escrow
+
+          account for GUARANTEED payments through intents
+      intents:
+        title: |-
+          intents is the option for intents for this collection (allow, deny,
+          required)
+        type: string
+        enum:
+          - ALLOW
+          - DENY
+          - REQUIRED
+        default: ALLOW
+        description: |2-
+           - ALLOW: Allow: Intents can be made for claims, but claims can also be made without
+          intents.
+           - DENY: Deny: Intents cannot be made for claims for the collection.
+           - REQUIRED: Required: Claims cannot be made without an associated intent. An intent is
+          mandatory before a claim can be submitted.
+  ixo.claims.v1beta1.CollectionIntentOptions:
+    type: string
+    enum:
+      - ALLOW
+      - DENY
+      - REQUIRED
+    default: ALLOW
+    description: |2-
+       - ALLOW: Allow: Intents can be made for claims, but claims can also be made without
+      intents.
+       - DENY: Deny: Intents cannot be made for claims for the collection.
+       - REQUIRED: Required: Claims cannot be made without an associated intent. An intent is
+      mandatory before a claim can be submitted.
   ixo.claims.v1beta1.CollectionState:
     type: string
     enum:
@@ -87338,10 +88177,10 @@ definitions:
             NOTE: The amount field is an Int which implements the custom method
             signatures required by gogoproto.
         title: >-
-          custom amount specified by evaluator for claim approval, if empty list
-          then
+          if both amount and cw20 amount are empty then use default by
+          Collection
 
-          use default by Collection
+          custom amount specified by evaluator for claim approval
       cw20_payment:
         type: array
         items:
@@ -87357,11 +88196,7 @@ definitions:
                 a
 
                 uint64(max 18446744073709551615)
-        title: >-
-          custom cw20 payments specified by evaluator for claim approval, if
-          empty
-
-          list then use default by Collection
+        title: custom cw20 payments specified by evaluator for claim approval
   ixo.claims.v1beta1.EvaluationStatus:
     type: string
     enum:
@@ -87371,6 +88206,113 @@ definitions:
       - DISPUTED
       - INVALIDATED
     default: PENDING
+  ixo.claims.v1beta1.Intent:
+    type: object
+    properties:
+      id:
+        type: string
+        title: id is the incremented internal id for the intent
+      agent_did:
+        type: string
+        description: The service agent's DID (Decentralized Identifier).
+      agent_address:
+        type: string
+        description: The service agent's address.
+      collection_id:
+        type: string
+        description: The id of the collection this intent is linked to.
+      claim_id:
+        type: string
+        title: claim_id (optional, set when claim is submitted)
+      created_at:
+        type: string
+        format: date-time
+        description: The time the intent was created.
+      expire_at:
+        type: string
+        format: date-time
+        description: >-
+          Timeout period for the intent. If the claim is not submitted by this
+          time,
+
+          the intent expires.
+      status:
+        description: Status of the intent (e.g., "ACTIVE" or "FULFILLED").
+        type: string
+        enum:
+          - ACTIVE
+          - FULFILLED
+          - EXPIRED
+        default: ACTIVE
+        title: >-
+          - ACTIVE: Active: Intent is created and active, payments have been
+          transferred to
+
+          escrow if there is any
+           - FULFILLED: Fulfilled: Intent is fulfilled, was used to create a claim and funds will
+          be released on claim APPROVAL, or funds will be reverted on claim
+          REJECTION
+
+          or DISPUTE
+           - EXPIRED: Expired: Intent has expired, payments have been transferred back out of
+          escrow
+      amount:
+        type: array
+        items:
+          type: object
+          properties:
+            denom:
+              type: string
+            amount:
+              type: string
+          description: |-
+            Coin defines a token with a denomination and an amount.
+
+            NOTE: The amount field is an Int which implements the custom method
+            signatures required by gogoproto.
+        description: The payment amount the agent intends to claim, if any.
+      cw20_payment:
+        type: array
+        items:
+          type: object
+          properties:
+            address:
+              type: string
+            amount:
+              type: string
+              format: uint64
+              title: >-
+                chose uint64 for now as amounts should be small enough to fit in
+                a
+
+                uint64(max 18446744073709551615)
+        description: The CW20Payment amount the agent intends to claim, if any.
+      from_address:
+        type: string
+        title: the address the escrow payment came from
+      escrow_address:
+        type: string
+        title: the escrow account address
+    description: Intent defines the structure for a service agent's claim intent.
+  ixo.claims.v1beta1.IntentStatus:
+    type: string
+    enum:
+      - ACTIVE
+      - FULFILLED
+      - EXPIRED
+    default: ACTIVE
+    title: >-
+      - ACTIVE: Active: Intent is created and active, payments have been
+      transferred to
+
+      escrow if there is any
+       - FULFILLED: Fulfilled: Intent is fulfilled, was used to create a claim and funds will
+      be released on claim APPROVAL, or funds will be reverted on claim
+      REJECTION
+
+      or DISPUTE
+       - EXPIRED: Expired: Intent has expired, payments have been transferred back out of
+      escrow
   ixo.claims.v1beta1.Params:
     type: object
     properties:
@@ -87383,6 +88325,9 @@ definitions:
         type: string
       node_fee_percentage:
         type: string
+      intent_sequence:
+        type: string
+        format: uint64
   ixo.claims.v1beta1.Payment:
     type: object
     properties:
@@ -87439,6 +88384,16 @@ definitions:
 
                 uint64(max 18446744073709551615)
         title: cw20 payments, can be empty or multiple
+      is_oracle_payment:
+        type: boolean
+        title: >-
+          boolean to indicate if the payment is for oracle payments, aka it will
+          go
+
+          through network fees split NOTE: if true the payment can only have
+          amount
+
+          values(Native coins), no cw20 payments allowed then
   ixo.claims.v1beta1.PaymentStatus:
     type: string
     enum:
@@ -87450,6 +88405,13 @@ definitions:
       - FAILED
       - DISPUTED_PAYMENT
     default: NO_PAYMENT
+    title: |-
+      - PROMISED: Promised: Agent is contracted to receive payment
+       - AUTHORIZED: Authorized: Authz set up, no guarantee
+       - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+       - PAID: Paid: Funds have been paid
+       - FAILED: Failed: Payment failed, most probably due to insufficient funds
+       - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
   ixo.claims.v1beta1.Payments:
     type: object
     properties:
@@ -87514,6 +88476,16 @@ definitions:
 
                     uint64(max 18446744073709551615)
             title: cw20 payments, can be empty or multiple
+          is_oracle_payment:
+            type: boolean
+            title: >-
+              boolean to indicate if the payment is for oracle payments, aka it
+              will go
+
+              through network fees split NOTE: if true the payment can only have
+              amount
+
+              values(Native coins), no cw20 payments allowed then
       evaluation:
         type: object
         properties:
@@ -87575,6 +88547,16 @@ definitions:
 
                     uint64(max 18446744073709551615)
             title: cw20 payments, can be empty or multiple
+          is_oracle_payment:
+            type: boolean
+            title: >-
+              boolean to indicate if the payment is for oracle payments, aka it
+              will go
+
+              through network fees split NOTE: if true the payment can only have
+              amount
+
+              values(Native coins), no cw20 payments allowed then
       approval:
         type: object
         properties:
@@ -87636,6 +88618,16 @@ definitions:
 
                     uint64(max 18446744073709551615)
             title: cw20 payments, can be empty or multiple
+          is_oracle_payment:
+            type: boolean
+            title: >-
+              boolean to indicate if the payment is for oracle payments, aka it
+              will go
+
+              through network fees split NOTE: if true the payment can only have
+              amount
+
+              values(Native coins), no cw20 payments allowed then
       rejection:
         type: object
         properties:
@@ -87697,6 +88689,16 @@ definitions:
 
                     uint64(max 18446744073709551615)
             title: cw20 payments, can be empty or multiple
+          is_oracle_payment:
+            type: boolean
+            title: >-
+              boolean to indicate if the payment is for oracle payments, aka it
+              will go
+
+              through network fees split NOTE: if true the payment can only have
+              amount
+
+              values(Native coins), no cw20 payments allowed then
   ixo.claims.v1beta1.QueryClaimListResponse:
     type: object
     properties:
@@ -87801,10 +88803,10 @@ definitions:
 
                       signatures required by gogoproto.
                   title: >-
-                    custom amount specified by evaluator for claim approval, if
-                    empty list then
+                    if both amount and cw20 amount are empty then use default by
+                    Collection
 
-                    use default by Collection
+                    custom amount specified by evaluator for claim approval
                 cw20_payment:
                   type: array
                   items:
@@ -87822,10 +88824,9 @@ definitions:
                           uint64(max 18446744073709551615)
                   title: >-
                     custom cw20 payments specified by evaluator for claim
-                    approval, if empty
-
-                    list then use default by Collection
+                    approval
             payments_status:
+              title: payments_status is the status of the payments for the claim
               type: object
               properties:
                 submission:
@@ -87839,6 +88840,13 @@ definitions:
                     - FAILED
                     - DISPUTED_PAYMENT
                   default: NO_PAYMENT
+                  title: |-
+                    - PROMISED: Promised: Agent is contracted to receive payment
+                     - AUTHORIZED: Authorized: Authz set up, no guarantee
+                     - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+                     - PAID: Paid: Funds have been paid
+                     - FAILED: Failed: Payment failed, most probably due to insufficient funds
+                     - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
                 evaluation:
                   type: string
                   enum:
@@ -87850,6 +88858,13 @@ definitions:
                     - FAILED
                     - DISPUTED_PAYMENT
                   default: NO_PAYMENT
+                  title: |-
+                    - PROMISED: Promised: Agent is contracted to receive payment
+                     - AUTHORIZED: Authorized: Authz set up, no guarantee
+                     - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+                     - PAID: Paid: Funds have been paid
+                     - FAILED: Failed: Payment failed, most probably due to insufficient funds
+                     - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
                 approval:
                   type: string
                   enum:
@@ -87861,6 +88876,13 @@ definitions:
                     - FAILED
                     - DISPUTED_PAYMENT
                   default: NO_PAYMENT
+                  title: |-
+                    - PROMISED: Promised: Agent is contracted to receive payment
+                     - AUTHORIZED: Authorized: Authz set up, no guarantee
+                     - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+                     - PAID: Paid: Funds have been paid
+                     - FAILED: Failed: Payment failed, most probably due to insufficient funds
+                     - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
                 rejection:
                   type: string
                   enum:
@@ -87872,6 +88894,62 @@ definitions:
                     - FAILED
                     - DISPUTED_PAYMENT
                   default: NO_PAYMENT
+                  title: |-
+                    - PROMISED: Promised: Agent is contracted to receive payment
+                     - AUTHORIZED: Authorized: Authz set up, no guarantee
+                     - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+                     - PAID: Paid: Funds have been paid
+                     - FAILED: Failed: Payment failed, most probably due to insufficient funds
+                     - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
+            use_intent:
+              type: boolean
+              title: intent_id is the id of the intent for this claim, if any
+            amount:
+              type: array
+              items:
+                type: object
+                properties:
+                  denom:
+                    type: string
+                  amount:
+                    type: string
+                description: >-
+                  Coin defines a token with a denomination and an amount.
+
+
+                  NOTE: The amount field is an Int which implements the custom
+                  method
+
+                  signatures required by gogoproto.
+              title: >-
+                NOTE: if both amount and cw20 amount are empty then use default
+                by
+
+                Collection custom amount specified by service agent for claim
+                approval
+            cw20_payment:
+              type: array
+              items:
+                type: object
+                properties:
+                  address:
+                    type: string
+                  amount:
+                    type: string
+                    format: uint64
+                    title: >-
+                      chose uint64 for now as amounts should be small enough to
+                      fit in a
+
+                      uint64(max 18446744073709551615)
+              title: >-
+                NOTE: if both amount and cw20 amount are empty then use default
+                by
+
+                Collection custom cw20 payments specified by service agent for
+                claim
+
+                approval
       pagination:
         type: object
         properties:
@@ -88000,10 +89078,10 @@ definitions:
 
                     signatures required by gogoproto.
                 title: >-
-                  custom amount specified by evaluator for claim approval, if
-                  empty list then
+                  if both amount and cw20 amount are empty then use default by
+                  Collection
 
-                  use default by Collection
+                  custom amount specified by evaluator for claim approval
               cw20_payment:
                 type: array
                 items:
@@ -88019,12 +89097,9 @@ definitions:
                         to fit in a
 
                         uint64(max 18446744073709551615)
-                title: >-
-                  custom cw20 payments specified by evaluator for claim
-                  approval, if empty
-
-                  list then use default by Collection
+                title: custom cw20 payments specified by evaluator for claim approval
           payments_status:
+            title: payments_status is the status of the payments for the claim
             type: object
             properties:
               submission:
@@ -88038,6 +89113,13 @@ definitions:
                   - FAILED
                   - DISPUTED_PAYMENT
                 default: NO_PAYMENT
+                title: |-
+                  - PROMISED: Promised: Agent is contracted to receive payment
+                   - AUTHORIZED: Authorized: Authz set up, no guarantee
+                   - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+                   - PAID: Paid: Funds have been paid
+                   - FAILED: Failed: Payment failed, most probably due to insufficient funds
+                   - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
               evaluation:
                 type: string
                 enum:
@@ -88049,6 +89131,13 @@ definitions:
                   - FAILED
                   - DISPUTED_PAYMENT
                 default: NO_PAYMENT
+                title: |-
+                  - PROMISED: Promised: Agent is contracted to receive payment
+                   - AUTHORIZED: Authorized: Authz set up, no guarantee
+                   - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+                   - PAID: Paid: Funds have been paid
+                   - FAILED: Failed: Payment failed, most probably due to insufficient funds
+                   - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
               approval:
                 type: string
                 enum:
@@ -88060,6 +89149,13 @@ definitions:
                   - FAILED
                   - DISPUTED_PAYMENT
                 default: NO_PAYMENT
+                title: |-
+                  - PROMISED: Promised: Agent is contracted to receive payment
+                   - AUTHORIZED: Authorized: Authz set up, no guarantee
+                   - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+                   - PAID: Paid: Funds have been paid
+                   - FAILED: Failed: Payment failed, most probably due to insufficient funds
+                   - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
               rejection:
                 type: string
                 enum:
@@ -88071,6 +89167,60 @@ definitions:
                   - FAILED
                   - DISPUTED_PAYMENT
                 default: NO_PAYMENT
+                title: |-
+                  - PROMISED: Promised: Agent is contracted to receive payment
+                   - AUTHORIZED: Authorized: Authz set up, no guarantee
+                   - GUARANTEED: Guaranteed: Escrow set up with funds blocked
+                   - PAID: Paid: Funds have been paid
+                   - FAILED: Failed: Payment failed, most probably due to insufficient funds
+                   - DISPUTED_PAYMENT: DisputedPayment: Payment disputed
+          use_intent:
+            type: boolean
+            title: intent_id is the id of the intent for this claim, if any
+          amount:
+            type: array
+            items:
+              type: object
+              properties:
+                denom:
+                  type: string
+                amount:
+                  type: string
+              description: >-
+                Coin defines a token with a denomination and an amount.
+
+
+                NOTE: The amount field is an Int which implements the custom
+                method
+
+                signatures required by gogoproto.
+            title: >-
+              NOTE: if both amount and cw20 amount are empty then use default by
+
+              Collection custom amount specified by service agent for claim
+              approval
+          cw20_payment:
+            type: array
+            items:
+              type: object
+              properties:
+                address:
+                  type: string
+                amount:
+                  type: string
+                  format: uint64
+                  title: >-
+                    chose uint64 for now as amounts should be small enough to
+                    fit in a
+
+                    uint64(max 18446744073709551615)
+            title: >-
+              NOTE: if both amount and cw20 amount are empty then use default by
+
+              Collection custom cw20 payments specified by service agent for
+              claim
+
+              approval
   ixo.claims.v1beta1.QueryCollectionListResponse:
     type: object
     properties:
@@ -88235,6 +89385,16 @@ definitions:
 
                               uint64(max 18446744073709551615)
                       title: cw20 payments, can be empty or multiple
+                    is_oracle_payment:
+                      type: boolean
+                      title: >-
+                        boolean to indicate if the payment is for oracle
+                        payments, aka it will go
+
+                        through network fees split NOTE: if true the payment can
+                        only have amount
+
+                        values(Native coins), no cw20 payments allowed then
                 evaluation:
                   type: object
                   properties:
@@ -88297,6 +89457,16 @@ definitions:
 
                               uint64(max 18446744073709551615)
                       title: cw20 payments, can be empty or multiple
+                    is_oracle_payment:
+                      type: boolean
+                      title: >-
+                        boolean to indicate if the payment is for oracle
+                        payments, aka it will go
+
+                        through network fees split NOTE: if true the payment can
+                        only have amount
+
+                        values(Native coins), no cw20 payments allowed then
                 approval:
                   type: object
                   properties:
@@ -88359,6 +89529,16 @@ definitions:
 
                               uint64(max 18446744073709551615)
                       title: cw20 payments, can be empty or multiple
+                    is_oracle_payment:
+                      type: boolean
+                      title: >-
+                        boolean to indicate if the payment is for oracle
+                        payments, aka it will go
+
+                        through network fees split NOTE: if true the payment can
+                        only have amount
+
+                        values(Native coins), no cw20 payments allowed then
                 rejection:
                   type: object
                   properties:
@@ -88421,6 +89601,16 @@ definitions:
 
                               uint64(max 18446744073709551615)
                       title: cw20 payments, can be empty or multiple
+                    is_oracle_payment:
+                      type: boolean
+                      title: >-
+                        boolean to indicate if the payment is for oracle
+                        payments, aka it will go
+
+                        through network fees split NOTE: if true the payment can
+                        only have amount
+
+                        values(Native coins), no cw20 payments allowed then
             signer:
               type: string
               title: signer address
@@ -88432,6 +89622,34 @@ definitions:
                 invalid
 
                 (internally calculated)
+            escrow_account:
+              type: string
+              title: >-
+                escrow_account is the escrow account address for this collection
+                created at
+
+                collection creation, current purpose is to transfer payments to
+                escrow
+
+                account for GUARANTEED payments through intents
+            intents:
+              title: >-
+                intents is the option for intents for this collection (allow,
+                deny,
+
+                required)
+              type: string
+              enum:
+                - ALLOW
+                - DENY
+                - REQUIRED
+              default: ALLOW
+              description: |2-
+                 - ALLOW: Allow: Intents can be made for claims, but claims can also be made without
+                intents.
+                 - DENY: Deny: Intents cannot be made for claims for the collection.
+                 - REQUIRED: Required: Claims cannot be made without an associated intent. An intent is
+                mandatory before a claim can be submitted.
       pagination:
         type: object
         properties:
@@ -88619,6 +89837,16 @@ definitions:
 
                             uint64(max 18446744073709551615)
                     title: cw20 payments, can be empty or multiple
+                  is_oracle_payment:
+                    type: boolean
+                    title: >-
+                      boolean to indicate if the payment is for oracle payments,
+                      aka it will go
+
+                      through network fees split NOTE: if true the payment can
+                      only have amount
+
+                      values(Native coins), no cw20 payments allowed then
               evaluation:
                 type: object
                 properties:
@@ -88680,6 +89908,16 @@ definitions:
 
                             uint64(max 18446744073709551615)
                     title: cw20 payments, can be empty or multiple
+                  is_oracle_payment:
+                    type: boolean
+                    title: >-
+                      boolean to indicate if the payment is for oracle payments,
+                      aka it will go
+
+                      through network fees split NOTE: if true the payment can
+                      only have amount
+
+                      values(Native coins), no cw20 payments allowed then
               approval:
                 type: object
                 properties:
@@ -88741,6 +89979,16 @@ definitions:
 
                             uint64(max 18446744073709551615)
                     title: cw20 payments, can be empty or multiple
+                  is_oracle_payment:
+                    type: boolean
+                    title: >-
+                      boolean to indicate if the payment is for oracle payments,
+                      aka it will go
+
+                      through network fees split NOTE: if true the payment can
+                      only have amount
+
+                      values(Native coins), no cw20 payments allowed then
               rejection:
                 type: object
                 properties:
@@ -88802,6 +90050,16 @@ definitions:
 
                             uint64(max 18446744073709551615)
                     title: cw20 payments, can be empty or multiple
+                  is_oracle_payment:
+                    type: boolean
+                    title: >-
+                      boolean to indicate if the payment is for oracle payments,
+                      aka it will go
+
+                      through network fees split NOTE: if true the payment can
+                      only have amount
+
+                      values(Native coins), no cw20 payments allowed then
           signer:
             type: string
             title: signer address
@@ -88813,6 +90071,34 @@ definitions:
               invalid
 
               (internally calculated)
+          escrow_account:
+            type: string
+            title: >-
+              escrow_account is the escrow account address for this collection
+              created at
+
+              collection creation, current purpose is to transfer payments to
+              escrow
+
+              account for GUARANTEED payments through intents
+          intents:
+            title: >-
+              intents is the option for intents for this collection (allow,
+              deny,
+
+              required)
+            type: string
+            enum:
+              - ALLOW
+              - DENY
+              - REQUIRED
+            default: ALLOW
+            description: |2-
+               - ALLOW: Allow: Intents can be made for claims, but claims can also be made without
+              intents.
+               - DENY: Deny: Intents cannot be made for claims for the collection.
+               - REQUIRED: Required: Claims cannot be made without an associated intent. An intent is
+              mandatory before a claim can be submitted.
   ixo.claims.v1beta1.QueryDisputeListResponse:
     type: object
     properties:
@@ -88887,6 +90173,222 @@ definitions:
                 type: string
               encrypted:
                 type: boolean
+  ixo.claims.v1beta1.QueryIntentListResponse:
+    type: object
+    properties:
+      intents:
+        type: array
+        items:
+          type: object
+          properties:
+            id:
+              type: string
+              title: id is the incremented internal id for the intent
+            agent_did:
+              type: string
+              description: The service agent's DID (Decentralized Identifier).
+            agent_address:
+              type: string
+              description: The service agent's address.
+            collection_id:
+              type: string
+              description: The id of the collection this intent is linked to.
+            claim_id:
+              type: string
+              title: claim_id (optional, set when claim is submitted)
+            created_at:
+              type: string
+              format: date-time
+              description: The time the intent was created.
+            expire_at:
+              type: string
+              format: date-time
+              description: >-
+                Timeout period for the intent. If the claim is not submitted by
+                this time,
+
+                the intent expires.
+            status:
+              description: Status of the intent (e.g., "ACTIVE" or "FULFILLED").
+              type: string
+              enum:
+                - ACTIVE
+                - FULFILLED
+                - EXPIRED
+              default: ACTIVE
+              title: >-
+                - ACTIVE: Active: Intent is created and active, payments have
+                been transferred to
+
+                escrow if there is any
+                 - FULFILLED: Fulfilled: Intent is fulfilled, was used to create a claim and funds will
+                be released on claim APPROVAL, or funds will be reverted on
+                claim REJECTION
+
+                or DISPUTE
+                 - EXPIRED: Expired: Intent has expired, payments have been transferred back out of
+                escrow
+            amount:
+              type: array
+              items:
+                type: object
+                properties:
+                  denom:
+                    type: string
+                  amount:
+                    type: string
+                description: >-
+                  Coin defines a token with a denomination and an amount.
+
+
+                  NOTE: The amount field is an Int which implements the custom
+                  method
+
+                  signatures required by gogoproto.
+              description: The payment amount the agent intends to claim, if any.
+            cw20_payment:
+              type: array
+              items:
+                type: object
+                properties:
+                  address:
+                    type: string
+                  amount:
+                    type: string
+                    format: uint64
+                    title: >-
+                      chose uint64 for now as amounts should be small enough to
+                      fit in a
+
+                      uint64(max 18446744073709551615)
+              description: The CW20Payment amount the agent intends to claim, if any.
+            from_address:
+              type: string
+              title: the address the escrow payment came from
+            escrow_address:
+              type: string
+              title: the escrow account address
+          description: Intent defines the structure for a service agent's claim intent.
+      pagination:
+        type: object
+        properties:
+          next_key:
+            type: string
+            format: byte
+            description: |-
+              next_key is the key to be passed to PageRequest.key to
+              query the next page most efficiently. It will be empty if
+              there are no more results.
+          total:
+            type: string
+            format: uint64
+            title: >-
+              total is total number of results available if
+              PageRequest.count_total
+
+              was set, its value is undefined otherwise
+        description: |-
+          PageResponse is to be embedded in gRPC response messages where the
+          corresponding request message has used PageRequest.
+
+           message SomeResponse {
+                   repeated Bar results = 1;
+                   PageResponse page = 2;
+           }
+  ixo.claims.v1beta1.QueryIntentResponse:
+    type: object
+    properties:
+      intent:
+        type: object
+        properties:
+          id:
+            type: string
+            title: id is the incremented internal id for the intent
+          agent_did:
+            type: string
+            description: The service agent's DID (Decentralized Identifier).
+          agent_address:
+            type: string
+            description: The service agent's address.
+          collection_id:
+            type: string
+            description: The id of the collection this intent is linked to.
+          claim_id:
+            type: string
+            title: claim_id (optional, set when claim is submitted)
+          created_at:
+            type: string
+            format: date-time
+            description: The time the intent was created.
+          expire_at:
+            type: string
+            format: date-time
+            description: >-
+              Timeout period for the intent. If the claim is not submitted by
+              this time,
+
+              the intent expires.
+          status:
+            description: Status of the intent (e.g., "ACTIVE" or "FULFILLED").
+            type: string
+            enum:
+              - ACTIVE
+              - FULFILLED
+              - EXPIRED
+            default: ACTIVE
+            title: >-
+              - ACTIVE: Active: Intent is created and active, payments have been
+              transferred to
+
+              escrow if there is any
+               - FULFILLED: Fulfilled: Intent is fulfilled, was used to create a claim and funds will
+              be released on claim APPROVAL, or funds will be reverted on claim
+              REJECTION
+
+              or DISPUTE
+               - EXPIRED: Expired: Intent has expired, payments have been transferred back out of
+              escrow
+          amount:
+            type: array
+            items:
+              type: object
+              properties:
+                denom:
+                  type: string
+                amount:
+                  type: string
+              description: >-
+                Coin defines a token with a denomination and an amount.
+
+
+                NOTE: The amount field is an Int which implements the custom
+                method
+
+                signatures required by gogoproto.
+            description: The payment amount the agent intends to claim, if any.
+          cw20_payment:
+            type: array
+            items:
+              type: object
+              properties:
+                address:
+                  type: string
+                amount:
+                  type: string
+                  format: uint64
+                  title: >-
+                    chose uint64 for now as amounts should be small enough to
+                    fit in a
+
+                    uint64(max 18446744073709551615)
+            description: The CW20Payment amount the agent intends to claim, if any.
+          from_address:
+            type: string
+            title: the address the escrow payment came from
+          escrow_address:
+            type: string
+            title: the escrow account address
+        description: Intent defines the structure for a service agent's claim intent.
   ixo.claims.v1beta1.QueryParamsResponse:
     type: object
     properties:
@@ -88903,6 +90405,9 @@ definitions:
             type: string
           node_fee_percentage:
             type: string
+          intent_sequence:
+            type: string
+            format: uint64
   ixo.entity.v1beta1.Entity:
     type: object
     properties:
diff --git a/proto/ixo/claims/v1beta1/authz.proto b/proto/ixo/claims/v1beta1/authz.proto
index 0a000a94..04114161 100644
--- a/proto/ixo/claims/v1beta1/authz.proto
+++ b/proto/ixo/claims/v1beta1/authz.proto
@@ -6,6 +6,7 @@ import "cosmos_proto/cosmos.proto";
 import "google/protobuf/timestamp.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "ixo/claims/v1beta1/claims.proto";
+import "google/protobuf/duration.proto";
 import "cosmos/bank/v1beta1/bank.proto";
 
 option go_package = "github.com/ixofoundation/ixo-blockchain/v3/x/claims/types";
@@ -23,6 +24,19 @@ message SubmitClaimConstraints {
   // collection_id indicates to which Collection this claim belongs
   string collection_id = 1;
   uint64 agent_quota = 2;
+  // custom max_amount allowed to be specified by service agent for claim
+  // approval, if empty then no custom amount is allowed
+  repeated cosmos.base.v1beta1.Coin max_amount = 3 [
+    (gogoproto.nullable) = false,
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
+  // custom max_cw20_payment allowed to be specified by service agent for claim
+  // approval, if empty then no custom amount is allowed
+  repeated CW20Payment max_cw20_payment = 4;
+  // intent_duration_ns is the duration for which the intent is active, after
+  // which it will expire (in nanoseconds)
+  google.protobuf.Duration intent_duration_ns = 5
+      [ (gogoproto.nullable) = false, (gogoproto.stdduration) = true ];
 }
 
 message EvaluateClaimAuthorization {
diff --git a/proto/ixo/claims/v1beta1/claims.proto b/proto/ixo/claims/v1beta1/claims.proto
index 0b9a5aed..7e50df27 100644
--- a/proto/ixo/claims/v1beta1/claims.proto
+++ b/proto/ixo/claims/v1beta1/claims.proto
@@ -22,6 +22,7 @@ message Params {
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
+  uint64 intent_sequence = 5;
 }
 
 enum CollectionState {
@@ -30,6 +31,17 @@ enum CollectionState {
   CLOSED = 2 [ (gogoproto.enumvalue_customname) = "closed" ];
 }
 
+enum CollectionIntentOptions {
+  // Allow: Intents can be made for claims, but claims can also be made without
+  // intents.
+  ALLOW = 0 [ (gogoproto.enumvalue_customname) = "allow" ];
+  // Deny: Intents cannot be made for claims for the collection.
+  DENY = 1 [ (gogoproto.enumvalue_customname) = "deny" ];
+  // Required: Claims cannot be made without an associated intent. An intent is
+  // mandatory before a claim can be submitted.
+  REQUIRED = 2 [ (gogoproto.enumvalue_customname) = "required" ];
+}
+
 enum EvaluationStatus {
   PENDING = 0 [ (gogoproto.enumvalue_customname) = "pending" ];
   APPROVED = 1 [ (gogoproto.enumvalue_customname) = "approved" ];
@@ -38,6 +50,19 @@ enum EvaluationStatus {
   INVALIDATED = 4 [ (gogoproto.enumvalue_customname) = "invalidated" ];
 }
 
+enum IntentStatus {
+  // Active: Intent is created and active, payments have been transferred to
+  // escrow if there is any
+  ACTIVE = 0 [ (gogoproto.enumvalue_customname) = "active" ];
+  // Fulfilled: Intent is fulfilled, was used to create a claim and funds will
+  // be released on claim APPROVAL, or funds will be reverted on claim REJECTION
+  // or DISPUTE
+  FULFILLED = 1 [ (gogoproto.enumvalue_customname) = "fulfilled" ];
+  // Expired: Intent has expired, payments have been transferred back out of
+  // escrow
+  EXPIRED = 2 [ (gogoproto.enumvalue_customname) = "expired" ];
+}
+
 enum PaymentType {
   SUBMISSION = 0 [ (gogoproto.enumvalue_customname) = "submission" ];
   APPROVAL = 1 [ (gogoproto.enumvalue_customname) = "approval" ];
@@ -47,14 +72,17 @@ enum PaymentType {
 
 enum PaymentStatus {
   NO_PAYMENT = 0 [ (gogoproto.enumvalue_customname) = "no_payment" ];
-  PROMISED = 1 [ (gogoproto.enumvalue_customname) =
-                     "promised" ]; // agent is contracted to receive payment
-  AUTHORIZED = 2 [ (gogoproto.enumvalue_customname) =
-                       "authorized" ]; // authz set up, no guarantee
-  GUARANTEED = 3 [ (gogoproto.enumvalue_customname) =
-                       "guaranteed" ]; // escrow set up with funds blocked
+  // Promised: Agent is contracted to receive payment
+  PROMISED = 1 [ (gogoproto.enumvalue_customname) = "promised" ];
+  // Authorized: Authz set up, no guarantee
+  AUTHORIZED = 2 [ (gogoproto.enumvalue_customname) = "authorized" ];
+  // Guaranteed: Escrow set up with funds blocked
+  GUARANTEED = 3 [ (gogoproto.enumvalue_customname) = "guaranteed" ];
+  // Paid: Funds have been paid
   PAID = 4 [ (gogoproto.enumvalue_customname) = "paid" ];
+  // Failed: Payment failed, most probably due to insufficient funds
   FAILED = 5 [ (gogoproto.enumvalue_customname) = "failed" ];
+  // DisputedPayment: Payment disputed
   DISPUTED_PAYMENT = 6 [ (gogoproto.enumvalue_customname) = "disputed" ];
 }
 
@@ -99,6 +127,13 @@ message Collection {
   // invalidated is the number of claims that have been evaluated as invalid
   // (internally calculated)
   uint64 invalidated = 16;
+  // escrow_account is the escrow account address for this collection created at
+  // collection creation, current purpose is to transfer payments to escrow
+  // account for GUARANTEED payments through intents
+  string escrow_account = 17;
+  // intents is the option for intents for this collection (allow, deny,
+  // required)
+  CollectionIntentOptions intents = 18;
 }
 
 message Payments {
@@ -124,6 +159,10 @@ message Payment {
       [ (gogoproto.nullable) = false, (gogoproto.stdduration) = true ];
   // cw20 payments, can be empty or multiple
   repeated CW20Payment cw20_payment = 5;
+  // boolean to indicate if the payment is for oracle payments, aka it will go
+  // through network fees split NOTE: if true the payment can only have amount
+  // values(Native coins), no cw20 payments allowed then
+  bool is_oracle_payment = 6;
 }
 
 message Contract1155Payment {
@@ -155,7 +194,20 @@ message Claim {
   string claim_id = 5;
   // evaluation is the result of one or more claim evaluations
   Evaluation evaluation = 6;
+  // payments_status is the status of the payments for the claim
   ClaimPayments payments_status = 7;
+  // intent_id is the id of the intent for this claim, if any
+  bool use_intent = 8;
+  // NOTE: if both amount and cw20 amount are empty then use default by
+  // Collection custom amount specified by service agent for claim approval
+  repeated cosmos.base.v1beta1.Coin amount = 9 [
+    (gogoproto.nullable) = false,
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
+  // NOTE: if both amount and cw20 amount are empty then use default by
+  // Collection custom cw20 payments specified by service agent for claim
+  // approval
+  repeated CW20Payment cw20_payment = 10;
 }
 
 message ClaimPayments {
@@ -188,14 +240,13 @@ message Evaluation {
   // evaluationDate is the date and time that the claim evaluation was submitted
   // on-chain
   google.protobuf.Timestamp evaluation_date = 9 [ (gogoproto.stdtime) = true ];
-  // custom amount specified by evaluator for claim approval, if empty list then
-  // use default by Collection
+  // if both amount and cw20 amount are empty then use default by Collection
+  // custom amount specified by evaluator for claim approval
   repeated cosmos.base.v1beta1.Coin amount = 10 [
     (gogoproto.nullable) = false,
     (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
   ];
-  // custom cw20 payments specified by evaluator for claim approval, if empty
-  // list then use default by Collection
+  // custom cw20 payments specified by evaluator for claim approval
   repeated CW20Payment cw20_payment = 11;
 }
 
@@ -212,3 +263,35 @@ message DisputeData {
   string proof = 3;
   bool encrypted = 4;
 }
+
+// Intent defines the structure for a service agent's claim intent.
+message Intent {
+  // id is the incremented internal id for the intent
+  string id = 1;
+  // The service agent's DID (Decentralized Identifier).
+  string agent_did = 2;
+  // The service agent's address.
+  string agent_address = 3;
+  // The id of the collection this intent is linked to.
+  string collection_id = 4;
+  // claim_id (optional, set when claim is submitted)
+  string claim_id = 5;
+  // The time the intent was created.
+  google.protobuf.Timestamp created_at = 6 [ (gogoproto.stdtime) = true ];
+  // Timeout period for the intent. If the claim is not submitted by this time,
+  // the intent expires.
+  google.protobuf.Timestamp expire_at = 7 [ (gogoproto.stdtime) = true ];
+  // Status of the intent (e.g., "ACTIVE" or "FULFILLED").
+  IntentStatus status = 8;
+  // The payment amount the agent intends to claim, if any.
+  repeated cosmos.base.v1beta1.Coin amount = 9 [
+    (gogoproto.nullable) = false,
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
+  // The CW20Payment amount the agent intends to claim, if any.
+  repeated CW20Payment cw20_payment = 10;
+  // the address the escrow payment came from
+  string from_address = 11;
+  // the escrow account address
+  string escrow_address = 12;
+}
diff --git a/proto/ixo/claims/v1beta1/event.proto b/proto/ixo/claims/v1beta1/event.proto
index 16038fbc..d3c86424 100755
--- a/proto/ixo/claims/v1beta1/event.proto
+++ b/proto/ixo/claims/v1beta1/event.proto
@@ -29,4 +29,10 @@ message ClaimDisputedEvent { Dispute dispute = 1; }
 message PaymentWithdrawnEvent { WithdrawPaymentConstraints withdraw = 1; }
 
 // ClaimDisputedEvent is an event triggered on a Claim dispute
-message PaymentWithdrawCreatedEvent { WithdrawPaymentConstraints withdraw = 1; }
\ No newline at end of file
+message PaymentWithdrawCreatedEvent { WithdrawPaymentConstraints withdraw = 1; }
+
+// IntentSubmittedEvent is an event triggered on an Intent submission
+message IntentSubmittedEvent { Intent intent = 1; }
+
+// IntentUpdatedEvent is an event triggered on an Intent update
+message IntentUpdatedEvent { Intent intent = 1; }
\ No newline at end of file
diff --git a/proto/ixo/claims/v1beta1/genesis.proto b/proto/ixo/claims/v1beta1/genesis.proto
index 258566fc..d92d2124 100755
--- a/proto/ixo/claims/v1beta1/genesis.proto
+++ b/proto/ixo/claims/v1beta1/genesis.proto
@@ -12,4 +12,5 @@ message GenesisState {
   repeated Collection collections = 2 [ (gogoproto.nullable) = false ];
   repeated Claim claims = 3 [ (gogoproto.nullable) = false ];
   repeated Dispute disputes = 4 [ (gogoproto.nullable) = false ];
+  repeated Intent intents = 5 [ (gogoproto.nullable) = false ];
 }
diff --git a/proto/ixo/claims/v1beta1/query.proto b/proto/ixo/claims/v1beta1/query.proto
old mode 100755
new mode 100644
index eadeeb2c..29274d45
--- a/proto/ixo/claims/v1beta1/query.proto
+++ b/proto/ixo/claims/v1beta1/query.proto
@@ -33,6 +33,13 @@ service Query {
   rpc DisputeList(QueryDisputeListRequest) returns (QueryDisputeListResponse) {
     option (google.api.http).get = "/ixo/dispute";
   }
+  rpc Intent(QueryIntentRequest) returns (QueryIntentResponse) {
+    option (google.api.http).get =
+        "/ixo/intent/{agentAddress}/{collectionId}/{id}";
+  }
+  rpc IntentList(QueryIntentListRequest) returns (QueryIntentListResponse) {
+    option (google.api.http).get = "/ixo/intent";
+  }
 }
 
 message QueryParamsRequest {}
@@ -84,3 +91,22 @@ message QueryDisputeListResponse {
   repeated Dispute disputes = 1 [ (gogoproto.nullable) = false ];
   cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }
+
+message QueryIntentRequest {
+  string id = 1;
+  string agentAddress = 2;
+  string collectionId = 3;
+}
+
+message QueryIntentResponse {
+  Intent intent = 1 [ (gogoproto.nullable) = false ];
+}
+
+message QueryIntentListRequest {
+  cosmos.base.query.v1beta1.PageRequest pagination = 1;
+}
+
+message QueryIntentListResponse {
+  repeated Intent intents = 1 [ (gogoproto.nullable) = false ];
+  cosmos.base.query.v1beta1.PageResponse pagination = 2;
+}
diff --git a/proto/ixo/claims/v1beta1/tx.proto b/proto/ixo/claims/v1beta1/tx.proto
index 26ef01a5..dd14b341 100644
--- a/proto/ixo/claims/v1beta1/tx.proto
+++ b/proto/ixo/claims/v1beta1/tx.proto
@@ -24,6 +24,9 @@ service Msg {
       returns (MsgUpdateCollectionDatesResponse);
   rpc UpdateCollectionPayments(MsgUpdateCollectionPayments)
       returns (MsgUpdateCollectionPaymentsResponse);
+  rpc UpdateCollectionIntents(MsgUpdateCollectionIntents)
+      returns (MsgUpdateCollectionIntentsResponse);
+  rpc ClaimIntent(MsgClaimIntent) returns (MsgClaimIntentResponse);
 }
 
 message MsgCreateCollection {
@@ -47,8 +50,10 @@ message MsgCreateCollection {
   // payments is the amount paid for claim submission, evaluation, approval, or
   // rejection
   Payments payments = 8;
+  // intents is the option for intents for this collection (allow, deny,
+  // required)
+  CollectionIntentOptions intents = 9;
 }
-
 message MsgCreateCollectionResponse {}
 
 message MsgSubmitClaim {
@@ -66,8 +71,22 @@ message MsgSubmitClaim {
   string agent_address = 4;
   // admin address used to sign this message, validated against Collection Admin
   string admin_address = 5;
+  // use_intent is the option for using intent for this claim if it exists and
+  // is active. NOTE: if use_intent is true then amount and cw20 amount are
+  // ignored and overriden with intent amounts. NOTE: if use_intent is true and
+  // there is no active intent then will error
+  bool use_intent = 6;
+  // NOTE: if both amount and cw20_payment are empty then use default by
+  // Collection custom amount specified by service agent for claim approval
+  repeated cosmos.base.v1beta1.Coin amount = 7 [
+    (gogoproto.nullable) = false,
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
+  // NOTE: if both amount and cw20 amount are empty then use default by
+  // Collection custom cw20 payments specified by service agent for claim
+  // approval
+  repeated CW20Payment cw20_payment = 8;
 }
-
 message MsgSubmitClaimResponse {}
 
 message MsgEvaluateClaim {
@@ -95,17 +114,18 @@ message MsgEvaluateClaim {
   uint32 reason = 8;
   // verificationProof is the cid of the evaluation Verfiable Credential
   string verification_proof = 9;
-  // custom amount specified by evaluator for claim approval, if empty list then
-  // use default by Collection
+  // NOTE: if claim is using intent, then amount and cw20 amount are ignored and overriden with intent amounts
+  // NOTE: if both amount and cw20 amount are empty then use collection default
+  // custom amount specified by evaluator for claim approval
   repeated cosmos.base.v1beta1.Coin amount = 10 [
     (gogoproto.nullable) = false,
     (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
   ];
-  // custom cw20 payments specified by evaluator for claim approval, if empty
-  // list then use default by Collection
+  // NOTE: if claim is using intent, then amount and cw20 amount are ignored and overriden with intent amounts
+  // NOTE: if both amount and cw20 amount are empty then use collection default
+  // custom cw20 payments specified by evaluator for claim approval
   repeated CW20Payment cw20_payment = 11;
 }
-
 message MsgEvaluateClaimResponse {}
 
 // Agent laying dispute must be admin for Collection, or controller on
@@ -127,7 +147,6 @@ message MsgDisputeClaim {
   int32 dispute_type = 4;
   DisputeData data = 5;
 }
-
 message MsgDisputeClaimResponse {}
 
 message MsgWithdrawPayment {
@@ -158,7 +177,6 @@ message MsgWithdrawPayment {
   // cw20 payments, can be empty or multiple
   repeated CW20Payment cw20_payment = 10;
 }
-
 message MsgWithdrawPaymentResponse {}
 
 message MsgUpdateCollectionState {
@@ -172,7 +190,6 @@ message MsgUpdateCollectionState {
   // admin address used to sign this message, validated against Collection Admin
   string admin_address = 3;
 }
-
 message MsgUpdateCollectionStateResponse {}
 
 message MsgUpdateCollectionDates {
@@ -188,7 +205,6 @@ message MsgUpdateCollectionDates {
   // admin address used to sign this message, validated against Collection Admin
   string admin_address = 4;
 }
-
 message MsgUpdateCollectionDatesResponse {}
 
 message MsgUpdateCollectionPayments {
@@ -202,5 +218,49 @@ message MsgUpdateCollectionPayments {
   // admin address used to sign this message, validated against Collection Admin
   string admin_address = 3;
 }
+message MsgUpdateCollectionPaymentsResponse {}
+
+message MsgUpdateCollectionIntents {
+  option (cosmos.msg.v1.signer) = "admin_address";
 
-message MsgUpdateCollectionPaymentsResponse {}
\ No newline at end of file
+  // collection_id indicates which Collection to update
+  string collection_id = 1;
+  // intents is the option for intents for this collection (allow, deny,
+  // required)
+  CollectionIntentOptions intents = 2;
+  // admin address used to sign this message, validated against Collection Admin
+  string admin_address = 3;
+}
+message MsgUpdateCollectionIntentsResponse {}
+
+message MsgClaimIntent {
+  option (cosmos.msg.v1.signer) = "agent_address";
+
+  // The service agent's DID (Decentralized Identifier).
+  string agent_did = 1 [
+    (gogoproto.casttype) =
+        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
+  ];
+  // The service agent's address (who submits this message).
+  string agent_address = 2;
+  // The id of the collection this intent is linked to.
+  string collection_id = 3;
+  // NOTE: if both amount and cw20 amount are empty then default by Collection
+  // is used (APPROVAL payment). The desired claim amount, if any.
+  repeated cosmos.base.v1beta1.Coin amount = 4 [
+    (gogoproto.nullable) = false,
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
+  // NOTE: if both amount and cw20 amount are empty then default by Collection
+  // is used (APPROVAL payment). The custom CW20 payment, if any.
+  repeated CW20Payment cw20_payment = 5;
+}
+
+// MsgClaimIntentResponse defines the response after submitting an intent.
+message MsgClaimIntentResponse {
+  // Resulting intent id.
+  string intent_id = 1;
+  // Timeout period for the intent. If the claim is not submitted by this time,
+  // the intent expires.
+  google.protobuf.Timestamp expire_at = 2 [ (gogoproto.stdtime) = true ];
+}
diff --git a/wasmbinding/stargate_whitelist.go b/wasmbinding/stargate_whitelist.go
index abb5d135..c9a4292d 100755
--- a/wasmbinding/stargate_whitelist.go
+++ b/wasmbinding/stargate_whitelist.go
@@ -18,6 +18,7 @@ import (
 	entitytypes "github.com/ixofoundation/ixo-blockchain/v3/x/entity/types"
 	epochtypes "github.com/ixofoundation/ixo-blockchain/v3/x/epochs/types"
 	iidtypes "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types"
+	minttypes "github.com/ixofoundation/ixo-blockchain/v3/x/mint/types"
 	smartaccounttypes "github.com/ixofoundation/ixo-blockchain/v3/x/smart-account/types"
 	tokentypes "github.com/ixofoundation/ixo-blockchain/v3/x/token/types"
 )
@@ -99,6 +100,8 @@ func init() {
 	setWhitelistedQuery("/ixo.claims.v1beta1.Query/Collection", &claimstypes.QueryCollectionResponse{})
 	setWhitelistedQuery("/ixo.claims.v1beta1.Query/Claim", &claimstypes.QueryClaimResponse{})
 	setWhitelistedQuery("/ixo.claims.v1beta1.Query/Dispute", &claimstypes.QueryDisputeResponse{})
+	setWhitelistedQuery("/ixo.claims.v1beta1.Query/Intent", &claimstypes.QueryIntentResponse{})
+	setWhitelistedQuery("/ixo.claims.v1beta1.Query/IntentList", &claimstypes.QueryIntentListResponse{})
 
 	// entity
 	setWhitelistedQuery("/ixo.entity.v1beta1.Query/Params", &entitytypes.QueryParamsResponse{})
@@ -111,6 +114,7 @@ func init() {
 	// token
 	setWhitelistedQuery("/ixo.token.v1beta1.Query/Params", &tokentypes.QueryParamsResponse{})
 	setWhitelistedQuery("/ixo.token.v1beta1.Query/TokenMetadata", &tokentypes.QueryTokenMetadataResponse{})
+	setWhitelistedQuery("/ixo.token.v1beta1.Query/TokenDoc", &tokentypes.QueryTokenDocResponse{})
 
 	// smartaccount
 	setWhitelistedQuery("/ixo.smartaccount.v1beta1.Query/Params", &smartaccounttypes.QueryParamsResponse{})
@@ -120,6 +124,10 @@ func init() {
 	// epochs
 	setWhitelistedQuery("/ixo.epochs.v1beta1.Query/EpochInfos", &epochtypes.QueryEpochsInfoResponse{})
 	setWhitelistedQuery("/ixo.epochs.v1beta1.Query/CurrentEpoch", &epochtypes.QueryCurrentEpochResponse{})
+
+	// mint
+	setWhitelistedQuery("/ixo.mint.v1beta1.Query/Params", &minttypes.QueryParamsResponse{})
+	setWhitelistedQuery("/ixo.mint.v1beta1.Query/EpochProvisions", &minttypes.QueryEpochProvisionsResponse{})
 }
 
 // IsWhitelistedQuery returns if the query is not whitelisted.
diff --git a/x/bonds/types/tx.go b/x/bonds/types/tx.go
index 8e681fd6..451f8e24 100755
--- a/x/bonds/types/tx.go
+++ b/x/bonds/types/tx.go
@@ -242,8 +242,6 @@ func NewMsgWithdrawReserve(withdrawerDid iidtypes.DIDFragment, amount sdk.Coins,
 
 func (msg MsgWithdrawReserve) GetIidController() iidtypes.DIDFragment { return msg.WithdrawerDid }
 
-// TODO: test messages once sdk works and they say we can safely remove all GetSigners and ValidateBasic, do so and test
-
 func (msg MsgWithdrawReserve) Route() string { return RouterKey }
 
 func (msg MsgWithdrawReserve) Type() string { return TypeMsgWithdrawReserve }
diff --git a/x/claims/abci.go b/x/claims/abci.go
new file mode 100644
index 00000000..c943751d
--- /dev/null
+++ b/x/claims/abci.go
@@ -0,0 +1,50 @@
+package claims
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/ixofoundation/ixo-blockchain/v3/x/claims/keeper"
+	"github.com/ixofoundation/ixo-blockchain/v3/x/claims/types"
+)
+
+// NOTE: if performance becomes an issue, we can consider using a similar approach to cosmos sdk grants queue
+// for active intents
+
+// EndBlocker is the end blocker function for the claims module
+func EndBlocker(ctx sdk.Context, k keeper.Keeper) {
+	// Get iterator for active intents
+	iterator := k.GetAll(ctx, types.IntentKey)
+	defer iterator.Close()
+
+	for ; iterator.Valid(); iterator.Next() {
+		var intent types.Intent
+		k.Unmarshal(iterator.Value(), &intent)
+
+		// Check if the intent is past its expiration date
+		if ctx.BlockTime().After(*intent.ExpireAt) {
+			// Get account used for APPROVAL payments on collection
+			fromAddress, err := sdk.AccAddressFromBech32(intent.FromAddress)
+			if err != nil {
+				panic(err)
+			}
+			// Get escrow address
+			escrow, err := sdk.AccAddressFromBech32(intent.EscrowAddress)
+			if err != nil {
+				panic(err)
+			}
+
+			// Transfer funds back to the original account
+			err = k.TransferIntentPayments(ctx, escrow, fromAddress, intent.Amount, intent.Cw20Payment)
+			if err != nil {
+				// if this happens then it means there is funds missing in escrow account, should never happen
+				panic(err)
+			}
+
+			// Mark intent as expired
+			intent.Status = types.IntentStatus_expired
+			err = k.RemoveIntentAndEmitEvents(ctx, intent)
+			if err != nil {
+				panic(err)
+			}
+		}
+	}
+}
diff --git a/x/claims/autocli.go b/x/claims/autocli.go
index f9e7c1a2..aef41f40 100644
--- a/x/claims/autocli.go
+++ b/x/claims/autocli.go
@@ -43,6 +43,17 @@ func (am AppModule) AutoCLIOptions() *autocliv1.ModuleOptions {
 					Short:          "Query for a dispute",
 					PositionalArgs: []*autocliv1.PositionalArgDescriptor{{ProtoField: "proof"}},
 				},
+				{
+					RpcMethod: "IntentList",
+					Use:       "intent-list",
+					Short:     "Query for all intents",
+				},
+				{
+					RpcMethod:      "Intent",
+					Use:            "intent [agent-address] [collection-id] [id]",
+					Short:          "Query for an intent",
+					PositionalArgs: []*autocliv1.PositionalArgDescriptor{{ProtoField: "agentAddress"}, {ProtoField: "collectionId"}, {ProtoField: "id"}},
+				},
 				{
 					RpcMethod: "Params",
 					Use:       "params",
diff --git a/x/claims/client/cli/tx.go b/x/claims/client/cli/tx.go
index abb9d8d2..7f1e641c 100755
--- a/x/claims/client/cli/tx.go
+++ b/x/claims/client/cli/tx.go
@@ -151,3 +151,27 @@ func NewCmdWithdrawPayment() *cobra.Command {
 	flags.AddTxFlagsToCmd(cmd)
 	return cmd
 }
+
+func NewCmdSubmitIntent() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "submit-intent [claim-intent-doc]",
+		Short: "Submit a claim - flag is raw json with struct of MsgClaimIntent",
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			var msg types.MsgClaimIntent
+			if err := json.Unmarshal([]byte(args[0]), &msg); err != nil {
+				return err
+			}
+
+			clientCtx, err := client.GetClientTxContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), &msg)
+		},
+	}
+
+	flags.AddTxFlagsToCmd(cmd)
+	return cmd
+}
diff --git a/x/claims/keeper/claims.go b/x/claims/keeper/claims.go
index 1dbe9cf3..172eb318 100755
--- a/x/claims/keeper/claims.go
+++ b/x/claims/keeper/claims.go
@@ -1,11 +1,16 @@
 package keeper
 
 import (
+	"fmt"
+
 	errorsmod "cosmossdk.io/errors"
+	"cosmossdk.io/math"
 	storetypes "cosmossdk.io/store/types"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/ixofoundation/ixo-blockchain/v3/x/claims/types"
+	"github.com/ixofoundation/ixo-blockchain/v3/x/token/types/contracts/cw20"
 )
 
 func (k Keeper) SetCollection(ctx sdk.Context, data types.Collection) {
@@ -38,6 +43,8 @@ func (k Keeper) Marshal(value interface{}) (bytes []byte) {
 		bytes = k.cdc.MustMarshal(&value)
 	case types.Dispute:
 		bytes = k.cdc.MustMarshal(&value)
+	case types.Intent:
+		bytes = k.cdc.MustMarshal(&value)
 	}
 	return
 }
@@ -148,3 +155,186 @@ func (k Keeper) GetDisputes(ctx sdk.Context) []types.Dispute {
 
 	return disputes
 }
+
+// SetIntent stores the intent in the KV store with the generated key format.
+func (k Keeper) SetIntent(ctx sdk.Context, data types.Intent) {
+	key := types.IntentKeyCreate(data.AgentAddress, data.CollectionId, data.Id)
+
+	k.Set(ctx, key, types.IntentKey, data, k.Marshal)
+}
+
+// GetIntent retrieves an intent from the KV store using the generated key.
+func (k Keeper) GetIntent(ctx sdk.Context, agentAddress, collectionId, intentID string) (types.Intent, error) {
+	key := types.IntentKeyCreate(agentAddress, collectionId, intentID)
+
+	// Retrieve the intent from the store
+	val, found := k.Get(ctx, key, types.IntentKey, k.UnmarshalIntent)
+	if !found {
+		return types.Intent{}, errorsmod.Wrapf(types.ErrIntentNotFound, "for id %s", intentID)
+	}
+	intent, ok := val.(types.Intent)
+	if !ok {
+		return types.Intent{}, errorsmod.Wrapf(types.ErrIntentNotFound, "for id %s", intentID)
+	}
+	return intent, nil
+}
+
+func (k Keeper) GetIntents(ctx sdk.Context) []types.Intent {
+	var intents []types.Intent
+	iterator := k.GetAll(ctx, types.IntentKey)
+	defer iterator.Close()
+	for ; iterator.Valid(); iterator.Next() {
+		var intent types.Intent
+		k.Unmarshal(iterator.Value(), &intent)
+		intents = append(intents, intent)
+	}
+	return intents
+}
+
+func (k Keeper) UnmarshalIntent(value []byte) (interface{}, bool) {
+	data := types.Intent{}
+	k.Unmarshal(value, &data)
+	return data, types.IsValidIntent(&data)
+}
+
+func (k Keeper) GetAllUserCollectionIntents(ctx sdk.Context, agentAddress, collectionId string) []types.Intent {
+	var intents []types.Intent
+
+	prefix := []byte(agentAddress + "/" + collectionId + "/")
+	iterator := k.GetAll(ctx, append(types.IntentKey, prefix...))
+	defer iterator.Close()
+
+	for ; iterator.Valid(); iterator.Next() {
+		var intent types.Intent
+		k.Unmarshal(iterator.Value(), &intent)
+		intents = append(intents, intent)
+	}
+
+	return intents
+}
+
+// GetActiveIntent retrieves agents current intents for the collection, and returns the first intent if exists
+func (k Keeper) GetActiveIntent(ctx sdk.Context, agentAddress, collectionId string) (types.Intent, bool) {
+	intents := k.GetAllUserCollectionIntents(ctx, agentAddress, collectionId)
+	if len(intents) == 0 {
+		return types.Intent{}, false
+	}
+	k.Logger(ctx).Info("intents", "intent", intents)
+	k.Logger(ctx).Info("intent", "intent", intents[0])
+	return intents[0], true
+}
+
+// RemoveIntentAndEmitEvents removes the intent from the KV store and emits the event as IntentUpdated
+// for offchain indexers, Intent status will always change on removal so safe to always emit UpdateIntent event
+func (k Keeper) RemoveIntentAndEmitEvents(ctx sdk.Context, intent types.Intent) error {
+	// first remove the intent from the KV store
+	key := types.IntentKeyCreate(intent.AgentAddress, intent.CollectionId, intent.Id)
+	k.Delete(ctx, key, types.IntentKey)
+
+	// then emit events for intent update for offchain indexers
+	if err := ctx.EventManager().EmitTypedEvent(
+		&types.IntentUpdatedEvent{
+			Intent: &intent,
+		},
+	); err != nil {
+		return err
+	}
+	return nil
+}
+
+// TransferCW20Payment transfers CW20 payments to the recipient address.
+func (k Keeper) TransferCW20Payment(ctx sdk.Context, fromAddress, toAddress sdk.AccAddress, payment *types.CW20Payment) error {
+	// make the payments if amount is not 0
+	if payment.Amount == 0 {
+		return nil
+	}
+
+	encodedTransferMessage, err := cw20.Marshal(cw20.WasmTransfer{
+		Transfer: cw20.Transfer{
+			Recipient: toAddress.String(),
+			Amount:    fmt.Sprint(payment.Amount),
+		},
+	})
+	if err != nil {
+		return err
+	}
+
+	contractAddress, err := sdk.AccAddressFromBech32(payment.Address)
+	if err != nil {
+		return err
+	}
+
+	_, err = k.WasmKeeper.Execute(
+		ctx,
+		contractAddress,
+		fromAddress,
+		encodedTransferMessage,
+		sdk.NewCoins(sdk.NewCoin("uixo", math.ZeroInt())),
+	)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// TransferIntentPayments transfers payments, both native coins and CW20 payments, to the recipient address.
+func (k Keeper) TransferIntentPayments(ctx sdk.Context, fromAddress, toAddress sdk.AccAddress, amount sdk.Coins, cw20Payments []*types.CW20Payment) error {
+	// transfer native coins
+	if len(amount) > 0 {
+		// clear any Coin with amount 0, generally validation will already block this,
+		// but we allow it to know when to use collection defaults or when to have no payments, aka amount 0.
+		cleanedAmount := sdk.Coins{}
+		for _, coin := range amount {
+			if coin.Amount.IsPositive() {
+				cleanedAmount = append(cleanedAmount, coin)
+			}
+		}
+
+		err := k.BankKeeper.SendCoins(ctx, fromAddress, toAddress, cleanedAmount)
+		if err != nil {
+			return err
+		}
+	}
+
+	// transfer CW20 payments
+	for _, payment := range cw20Payments {
+		if payment.Amount != 0 {
+			err := k.TransferCW20Payment(ctx, fromAddress, toAddress, payment)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+// Create a module account for entity id and name of account as fragemnt in form: did#name
+func (k Keeper) CreateNewCollectionEscrow(ctx sdk.Context, collectionId string) (sdk.AccAddress, error) {
+	address := types.GetModuleAccountAddressEscrow(collectionId)
+
+	if k.AccountKeeper.GetAccount(ctx, address) != nil {
+		return nil, errorsmod.Wrap(sdkerrors.ErrInvalidAddress, "account already exists")
+	}
+
+	account := k.AccountKeeper.NewAccountWithAddress(ctx, address)
+	k.AccountKeeper.SetAccount(ctx, account)
+
+	return account.GetAddress(), nil
+}
+
+// CollectionPersistAndEmitEvents persists the collection and emits the events.
+func (k Keeper) CollectionPersistAndEmitEvents(ctx sdk.Context, collection types.Collection) error {
+	// persist the Collection
+	k.SetCollection(ctx, collection)
+
+	// emit the events
+	if err := ctx.EventManager().EmitTypedEvent(
+		&types.CollectionCreatedEvent{
+			Collection: &collection,
+		},
+	); err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/x/claims/keeper/genesis.go b/x/claims/keeper/genesis.go
index 53c127f6..f391acac 100755
--- a/x/claims/keeper/genesis.go
+++ b/x/claims/keeper/genesis.go
@@ -24,6 +24,11 @@ func (k Keeper) InitGenesis(ctx sdk.Context, gs types.GenesisState) {
 	for _, d := range gs.Disputes {
 		k.SetDispute(ctx, d)
 	}
+
+	// save intents to the store
+	for _, i := range gs.Intents {
+		k.SetIntent(ctx, i)
+	}
 }
 
 // ExportGenesis returns the x/claims module's exported genesis.
@@ -31,15 +36,15 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
 	params := k.GetParams(ctx)
 
 	collections := k.GetCollections(ctx)
-
 	claims := k.GetClaims(ctx)
-
 	disputes := k.GetDisputes(ctx)
+	intents := k.GetIntents(ctx)
 
 	return &types.GenesisState{
 		Params:      params,
 		Collections: collections,
 		Disputes:    disputes,
 		Claims:      claims,
+		Intents:     intents,
 	}
 }
diff --git a/x/claims/keeper/grpc_query.go b/x/claims/keeper/grpc_query.go
index 0f200cb5..430cb9e6 100755
--- a/x/claims/keeper/grpc_query.go
+++ b/x/claims/keeper/grpc_query.go
@@ -141,3 +141,43 @@ func (k Keeper) DisputeList(c context.Context, req *types.QueryDisputeListReques
 
 	return &types.QueryDisputeListResponse{Disputes: disputes, Pagination: pageRes}, nil
 }
+
+func (k Keeper) Intent(c context.Context, req *types.QueryIntentRequest) (*types.QueryIntentResponse, error) {
+	if req == nil || req.Id == "" || req.AgentAddress == "" || req.CollectionId == "" {
+		return nil, status.Error(codes.InvalidArgument, "invalid request")
+	}
+
+	ctx := sdk.UnwrapSDKContext(c)
+	Dispute, err := k.GetIntent(ctx, req.AgentAddress, req.CollectionId, req.Id)
+	if err != nil {
+		return nil, err
+	}
+
+	return &types.QueryIntentResponse{Intent: Dispute}, nil
+}
+
+func (k Keeper) IntentList(c context.Context, req *types.QueryIntentListRequest) (*types.QueryIntentListResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "invalid request")
+	}
+
+	var intents []types.Intent
+	ctx := sdk.UnwrapSDKContext(c)
+	disputesStore := prefix.NewStore(ctx.KVStore(k.storeKey), types.IntentKey)
+
+	pageRes, err := query.Paginate(disputesStore, req.Pagination, func(key []byte, value []byte) error {
+		var intent types.Intent
+		if err := k.cdc.Unmarshal(value, &intent); err != nil {
+			return err
+		}
+
+		intents = append(intents, intent)
+		return nil
+	})
+
+	if err != nil {
+		return nil, status.Error(codes.Internal, err.Error())
+	}
+
+	return &types.QueryIntentListResponse{Intents: intents, Pagination: pageRes}, nil
+}
diff --git a/x/claims/keeper/keeper.go b/x/claims/keeper/keeper.go
index b115282b..b5dbb52b 100755
--- a/x/claims/keeper/keeper.go
+++ b/x/claims/keeper/keeper.go
@@ -19,14 +19,15 @@ type MarshalFn func(value interface{}) []byte
 
 type (
 	Keeper struct {
-		cdc          codec.BinaryCodec
-		storeKey     storetypes.StoreKey
-		paramstore   paramtypes.Subspace
-		AuthzKeeper  types.AuthzKeeper
-		IidKeeper    types.IidKeeper
-		BankKeeper   types.BankKeeper
-		EntityKeeper types.EntityKeeper
-		WasmKeeper   types.WasmKeeper
+		cdc           codec.BinaryCodec
+		storeKey      storetypes.StoreKey
+		paramstore    paramtypes.Subspace
+		AuthzKeeper   types.AuthzKeeper
+		IidKeeper     types.IidKeeper
+		BankKeeper    types.BankKeeper
+		EntityKeeper  types.EntityKeeper
+		WasmKeeper    types.WasmKeeper
+		AccountKeeper types.AccountKeeper
 	}
 )
 
@@ -39,6 +40,7 @@ func NewKeeper(
 	bankKeeper types.BankKeeper,
 	entityKeeper types.EntityKeeper,
 	wasmKeeper types.WasmKeeper,
+	accountKeeper types.AccountKeeper,
 ) Keeper {
 	// set KeyTable if it has not already been set
 	if !ps.HasKeyTable() {
@@ -46,14 +48,15 @@ func NewKeeper(
 	}
 
 	return Keeper{
-		cdc:          cdc,
-		storeKey:     storeKey,
-		paramstore:   ps,
-		IidKeeper:    iidKeeper,
-		AuthzKeeper:  authzKeeper,
-		BankKeeper:   bankKeeper,
-		EntityKeeper: entityKeeper,
-		WasmKeeper:   wasmKeeper,
+		cdc:           cdc,
+		storeKey:      storeKey,
+		paramstore:    ps,
+		IidKeeper:     iidKeeper,
+		AuthzKeeper:   authzKeeper,
+		BankKeeper:    bankKeeper,
+		EntityKeeper:  entityKeeper,
+		WasmKeeper:    wasmKeeper,
+		AccountKeeper: accountKeeper,
 	}
 }
 
diff --git a/x/claims/keeper/msg_server.go b/x/claims/keeper/msg_server.go
index 9dc2109e..ecb42b26 100755
--- a/x/claims/keeper/msg_server.go
+++ b/x/claims/keeper/msg_server.go
@@ -6,6 +6,7 @@ import (
 
 	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/ixofoundation/ixo-blockchain/v3/lib/ixo"
 	"github.com/ixofoundation/ixo-blockchain/v3/x/claims/types"
 	iidtypes "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types"
@@ -23,12 +24,15 @@ func NewMsgServerImpl(keeper *Keeper) types.MsgServer {
 	return &msgServer{Keeper: keeper}
 }
 
+// TODO: ensure to creatre escrow accounts on migration for existing collections
+// TODO: ADD 1155 and 721 capabilities to claims and payments also.
+// TODO: add possibility to allow multiple intents per agent based of collection flag
+
 // --------------------------
 // CREATE COLLECTION
 // --------------------------
 func (s msgServer) CreateCollection(goCtx context.Context, msg *types.MsgCreateCollection) (*types.MsgCreateCollectionResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
-	params := s.Keeper.GetParams(ctx)
 
 	// check that entity exists
 	_, entity, err := s.Keeper.EntityKeeper.ResolveEntity(ctx, msg.Entity)
@@ -66,11 +70,15 @@ func (s msgServer) CreateCollection(goCtx context.Context, msg *types.MsgCreateC
 		return nil, errorsmod.Wrapf(err, "for admin")
 	}
 
+	// get collection id from params and update params
+	params := s.Keeper.GetParams(ctx)
+	collectionSequence := params.CollectionSequence
+	params.CollectionSequence++
+	s.Keeper.SetParams(ctx, &params)
+
 	// create and persist the Collection
-	var collection types.Collection
-	collectionId := fmt.Sprint(params.CollectionSequence)
-	collection = types.Collection{
-		Id:          collectionId,
+	collection := types.Collection{
+		Id:          fmt.Sprint(collectionSequence),
 		Entity:      msg.Entity,
 		Admin:       admin.Address,
 		Protocol:    msg.Protocol,
@@ -85,20 +93,17 @@ func (s msgServer) CreateCollection(goCtx context.Context, msg *types.MsgCreateC
 		Invalidated: 0,
 		State:       msg.State,
 		Payments:    msg.Payments,
+		Intents:     msg.Intents,
 	}
 
-	s.Keeper.SetCollection(ctx, collection)
-
-	// update and persist createSequence
-	params.CollectionSequence++
-	s.Keeper.SetParams(ctx, &params)
+	// create escrow account for the collection
+	escrowAccount, err := s.Keeper.CreateNewCollectionEscrow(ctx, collection.Id)
+	if err != nil {
+		return nil, errorsmod.Wrapf(err, "failed to create escrow account for collection: %s", collection.Id)
+	}
+	collection.EscrowAccount = escrowAccount.String()
 
-	// emit the events
-	if err := ctx.EventManager().EmitTypedEvents(
-		&types.CollectionCreatedEvent{
-			Collection: &collection,
-		},
-	); err != nil {
+	if err := s.Keeper.CollectionPersistAndEmitEvents(ctx, collection); err != nil {
 		return nil, err
 	}
 
@@ -153,6 +158,29 @@ func (s msgServer) SubmitClaim(goCtx context.Context, msg *types.MsgSubmitClaim)
 		return nil, types.ErrClaimCollectionQuotaReached
 	}
 
+	// if intents are required then check if intent is used
+	if collection.Intents == types.CollectionIntentOptions_required && !msg.UseIntent {
+		return nil, errorsmod.Wrapf(sdkerrors.ErrInvalidRequest, "collection %s requires intent", msg.CollectionId)
+	}
+	// if intents are not allowed then check if intent is used
+	if collection.Intents == types.CollectionIntentOptions_deny && msg.UseIntent {
+		return nil, errorsmod.Wrapf(sdkerrors.ErrInvalidRequest, "collection %s does not allow intent", msg.CollectionId)
+	}
+
+	// get intent if used, if used agent must have an active intent for this collection
+	var intent types.Intent
+	var intentFound bool
+	if msg.UseIntent {
+		intent, intentFound = s.Keeper.GetActiveIntent(ctx, msg.AgentAddress, msg.CollectionId)
+		if !intentFound {
+			return nil, errorsmod.Wrapf(types.ErrIntentNotFound, "for agent %s and collection %s", msg.AgentAddress, msg.CollectionId)
+		}
+		// check if intent is expired
+		if !intent.ExpireAt.IsZero() && intent.ExpireAt.Before(ctx.BlockTime()) {
+			return nil, errorsmod.Wrapf(sdkerrors.ErrInvalidRequest, "intent %s is expired", intent.Id)
+		}
+	}
+
 	// create and persist the Claim
 	claimSubmissionDate := ctx.BlockTime()
 	claim := types.Claim{
@@ -167,28 +195,54 @@ func (s msgServer) SubmitClaim(goCtx context.Context, msg *types.MsgSubmitClaim)
 			Evaluation: types.PaymentStatus_no_payment,
 			Rejection:  types.PaymentStatus_no_payment,
 		},
+		Amount:      msg.Amount,
+		Cw20Payment: msg.Cw20Payment,
+		UseIntent:   msg.UseIntent,
 	}
 
-	s.Keeper.SetClaim(ctx, claim)
+	// if intent then override payments, add intent id and update APPROVAL payment to GUARANTEED
+	if msg.UseIntent {
+		claim.Amount = intent.Amount
+		claim.Cw20Payment = intent.Cw20Payment
+
+		// if either payment is not empty then APPROVAL payment become GUARANTEED as funds is in escrow account
+		// if both payments is empty or all amounts is 0 then APPROVAL payment stays NO_PAYMENT since no funds are in escrow account
+		if !intent.Amount.IsZero() || !types.IsZeroCW20Payments(intent.Cw20Payment) {
+			claim.PaymentsStatus.Approval = types.PaymentStatus_guaranteed
+		}
+
+		// mark intent as fulfilled
+		intent.Status = types.IntentStatus_fulfilled
+		intent.ClaimId = claim.ClaimId
+		err = s.Keeper.RemoveIntentAndEmitEvents(ctx, intent)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	// if collection approval payment is oracle payment then only native coins allowed
+	if collection.Payments.Approval.IsOraclePayment && !types.IsZeroCW20Payments(claim.Cw20Payment) {
+		return nil, types.ErrOraclePaymentOnlyNative
+	}
 
 	// update count for collection and persist
 	collection.Count++
-	s.Keeper.SetCollection(ctx, collection)
+	if err := s.Keeper.CollectionPersistAndEmitEvents(ctx, collection); err != nil {
+		return nil, err
+	}
 
-	// emit the events
+	// persist claim and emit the events
+	s.Keeper.SetClaim(ctx, claim)
 	if err := ctx.EventManager().EmitTypedEvents(
 		&types.ClaimSubmittedEvent{
 			Claim: &claim,
 		},
-		&types.CollectionUpdatedEvent{
-			Collection: &collection,
-		},
 	); err != nil {
 		return nil, err
 	}
 
 	// start payout process for claim submission
-	if err = processPayment(ctx, *s.Keeper, agent, collection.Payments.Submission, types.PaymentType_submission, msg.ClaimId); err != nil {
+	if err = processPayment(ctx, *s.Keeper, agent, collection.Payments.Submission, types.PaymentType_submission, msg.ClaimId, collection, false); err != nil {
 		return nil, err
 	}
 
@@ -256,12 +310,18 @@ func (s msgServer) EvaluateClaim(goCtx context.Context, msg *types.MsgEvaluateCl
 		Cw20Payment:       msg.Cw20Payment,
 	}
 
+	// if intent on claim then override payments with claim payments as it used the intent
+	if claim.UseIntent {
+		evaluation.Amount = claim.Amount
+		evaluation.Cw20Payment = claim.Cw20Payment
+	}
+
 	claim.Evaluation = &evaluation
 	s.Keeper.SetClaim(ctx, claim)
 
 	// start payout process for evaluation submission, if evaluation has status invalidated, dont run evaluation payout process
 	if msg.Status != types.EvaluationStatus_invalidated {
-		if err = processPayment(ctx, *s.Keeper, evalAgent, collection.Payments.Evaluation, types.PaymentType_evaluation, msg.ClaimId); err != nil {
+		if err = processPayment(ctx, *s.Keeper, evalAgent, collection.Payments.Evaluation, types.PaymentType_evaluation, msg.ClaimId, collection, false); err != nil {
 			return nil, err
 		}
 
@@ -269,26 +329,61 @@ func (s msgServer) EvaluateClaim(goCtx context.Context, msg *types.MsgEvaluateCl
 		collection.Evaluated++
 	}
 
+	// if status is not approved and intent was used then transfer funds back out of escrow account to current APPROVAL payments account
+	if msg.Status != types.EvaluationStatus_approved && claim.UseIntent {
+		// Get account used for APPROVAL payments on collection
+		approvalAddress, err := sdk.AccAddressFromBech32(collection.Payments.Approval.Account)
+		if err != nil {
+			return nil, err
+		}
+		// Get escrow address
+		escrow, err := sdk.AccAddressFromBech32(collection.EscrowAccount)
+		if err != nil {
+			return nil, err
+		}
+		if err := s.Keeper.TransferIntentPayments(ctx, escrow, approvalAddress, claim.Amount, claim.Cw20Payment); err != nil {
+			return nil, err
+		}
+		// Update payment status to no payment again as was guaranteed with intent
+		err = updatePaymentStatus(ctx, *s.Keeper, types.PaymentType_approval, msg.ClaimId, types.PaymentStatus_no_payment)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	// update amounts for collection, make payouts and persist
 	if msg.Status == types.EvaluationStatus_approved {
 		// payout process for evaluation approval to claim agent
 		collection.Approved++
-		// if msg amount/cw20Payment length is not zero, it means agent set custom amount/cw20Payment that was authenticated
-		// through authZ constraints to be valid since all evaluations must be done by module account through authz.
 		// Dereference the pointer to avoid changing collection payments as collection is saved in keeper below
 		approvedPayment := collection.Payments.Approval.Clone()
-		if len(msg.Amount) > 0 {
-			approvedPayment.Amount = msg.Amount
+		// if intent on claim then overide payments with claim payments as it used the intent and payment must be intent amount
+		// also override payment account to escrow account, so funds can be transferred from escrow to agent
+		if claim.UseIntent {
+			approvedPayment.Amount = claim.Amount
+			approvedPayment.Cw20Payment = claim.Cw20Payment
+			approvedPayment.Account = collection.EscrowAccount
+		} else {
+			// if either msg amount or cw20Payment length is not zero, it means agent set custom amount/cw20Payment that was authenticated
+			// through authZ constraints to be valid since all evaluations must be done by module account through authz
+			if len(msg.Amount) > 0 || len(msg.Cw20Payment) > 0 {
+				approvedPayment.Amount = msg.Amount
+				approvedPayment.Cw20Payment = msg.Cw20Payment
+			}
 		}
-		if len(msg.Cw20Payment) > 0 {
-			approvedPayment.Cw20Payment = msg.Cw20Payment
+		// if collection approval payment is oracle payment then only native coins allowed
+		if collection.Payments.Approval.IsOraclePayment && !types.IsZeroCW20Payments(approvedPayment.Cw20Payment) {
+			return nil, types.ErrOraclePaymentOnlyNative
 		}
-		if err = processPayment(ctx, *s.Keeper, claimAgent, approvedPayment, types.PaymentType_approval, msg.ClaimId); err != nil {
+		if err = processPayment(ctx, *s.Keeper, claimAgent, approvedPayment, types.PaymentType_approval, msg.ClaimId, collection, claim.UseIntent); err != nil {
 			return nil, err
 		}
 	} else if msg.Status == types.EvaluationStatus_rejected {
-		// no payment for rejected
+		// payout process for evaluation rejected to claim agent
 		collection.Rejected++
+		if err = processPayment(ctx, *s.Keeper, claimAgent, collection.Payments.Rejection, types.PaymentType_rejection, msg.ClaimId, collection, false); err != nil {
+			return nil, err
+		}
 	} else if msg.Status == types.EvaluationStatus_disputed {
 		// no payment for disputed
 		collection.Disputed++
@@ -301,7 +396,10 @@ func (s msgServer) EvaluateClaim(goCtx context.Context, msg *types.MsgEvaluateCl
 		// no payment for invalidated
 		collection.Invalidated++
 	}
-	s.Keeper.SetCollection(ctx, collection)
+
+	if err := s.Keeper.CollectionPersistAndEmitEvents(ctx, collection); err != nil {
+		return nil, err
+	}
 
 	// emit the events
 	if err := ctx.EventManager().EmitTypedEvents(
@@ -311,9 +409,6 @@ func (s msgServer) EvaluateClaim(goCtx context.Context, msg *types.MsgEvaluateCl
 		&types.ClaimUpdatedEvent{
 			Claim: &claim,
 		},
-		&types.CollectionUpdatedEvent{
-			Collection: &collection,
-		},
 	); err != nil {
 		return nil, err
 	}
@@ -433,6 +528,20 @@ func (s msgServer) WithdrawPayment(goCtx context.Context, msg *types.MsgWithdraw
 		return nil, err
 	}
 
+	// if any input address or the fromAddress is the escrow account then return error, as any escrow funds will be
+	// paid immediately through intents and never through this function, this also prevents collection owners from taking
+	// out funds from escrow account through this function
+	if msg.FromAddress == collection.EscrowAccount {
+		return nil, errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "from address cannot be collection's escrow account")
+	}
+	if len(msg.Inputs) > 0 {
+		for _, i := range msg.Inputs {
+			if i.Address == collection.EscrowAccount {
+				return nil, errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "input address cannot be collection's escrow account")
+			}
+		}
+	}
+
 	// check that user is authorized, aka signer is admin for Collection
 	if collection.Admin != msg.AdminAddress {
 		return nil, errorsmod.Wrapf(types.ErrClaimUnauthorized, "collection admin %s, msg admin address %s", collection.Admin, msg.AdminAddress)
@@ -450,7 +559,7 @@ func (s msgServer) WithdrawPayment(goCtx context.Context, msg *types.MsgWithdraw
 	}
 
 	// make payout
-	err = payout(ctx, *s.Keeper, msg.Inputs, msg.Outputs, msg.PaymentType, msg.ClaimId, msg.ReleaseDate, msg.Contract_1155Payment, msg.Cw20Payment, fromAddress, toAddress)
+	err = payout(ctx, *s.Keeper, msg.Inputs, msg.Outputs, msg.PaymentType, msg.ClaimId, collection, msg.ReleaseDate, msg.Contract_1155Payment, msg.Cw20Payment, fromAddress, toAddress)
 	if err != nil {
 		return nil, err
 	}
@@ -478,14 +587,7 @@ func (s msgServer) UpdateCollectionState(goCtx context.Context, msg *types.MsgUp
 	collection.State = msg.State
 
 	// persist the Collection
-	s.Keeper.SetCollection(ctx, collection)
-
-	// emit the events
-	if err := ctx.EventManager().EmitTypedEvents(
-		&types.CollectionUpdatedEvent{
-			Collection: &collection,
-		},
-	); err != nil {
+	if err := s.Keeper.CollectionPersistAndEmitEvents(ctx, collection); err != nil {
 		return nil, err
 	}
 
@@ -514,14 +616,7 @@ func (s msgServer) UpdateCollectionDates(goCtx context.Context, msg *types.MsgUp
 	collection.EndDate = msg.EndDate
 
 	// persist the Collection
-	s.Keeper.SetCollection(ctx, collection)
-
-	// emit the events
-	if err := ctx.EventManager().EmitTypedEvents(
-		&types.CollectionUpdatedEvent{
-			Collection: &collection,
-		},
-	); err != nil {
+	if err := s.Keeper.CollectionPersistAndEmitEvents(ctx, collection); err != nil {
 		return nil, err
 	}
 
@@ -569,16 +664,171 @@ func (s msgServer) UpdateCollectionPayments(goCtx context.Context, msg *types.Ms
 	collection.Payments = msg.Payments
 
 	// persist the Collection
-	s.Keeper.SetCollection(ctx, collection)
+	if err := s.Keeper.CollectionPersistAndEmitEvents(ctx, collection); err != nil {
+		return nil, err
+	}
 
-	// emit the events
+	return &types.MsgUpdateCollectionPaymentsResponse{}, nil
+}
+
+// --------------------------
+// UPDATE COLLECTION STATE
+// --------------------------
+func (s msgServer) UpdateCollectionIntents(goCtx context.Context, msg *types.MsgUpdateCollectionIntents) (*types.MsgUpdateCollectionIntentsResponse, error) {
+	ctx := sdk.UnwrapSDKContext(goCtx)
+
+	// Get Collection
+	collection, err := s.Keeper.GetCollection(ctx, msg.CollectionId)
+	if err != nil {
+		return nil, err
+	}
+
+	// check that signer is collection admin
+	if collection.Admin != msg.AdminAddress {
+		return nil, errorsmod.Wrapf(types.ErrClaimUnauthorized, "collection admin %s, msg admin address %s", collection.Admin, msg.AdminAddress)
+	}
+
+	// update Intents
+	collection.Intents = msg.Intents
+
+	// persist the Collection
+	if err := s.Keeper.CollectionPersistAndEmitEvents(ctx, collection); err != nil {
+		return nil, err
+	}
+
+	return &types.MsgUpdateCollectionIntentsResponse{}, nil
+}
+
+// --------------------------
+// CLAIM INTENT
+// --------------------------
+func (s msgServer) ClaimIntent(goCtx context.Context, msg *types.MsgClaimIntent) (*types.MsgClaimIntentResponse, error) {
+	ctx := sdk.UnwrapSDKContext(goCtx)
+
+	// Check if the agent already has an active intent for this collection, if has throw error
+	_, found := s.Keeper.GetActiveIntent(ctx, msg.AgentAddress, msg.CollectionId)
+	if found {
+		return nil, errorsmod.Wrapf(types.ErrIntentExists, "agent already has an active intent for collection %s", msg.CollectionId)
+	}
+
+	// Get Collection for Intent
+	collection, err := s.Keeper.GetCollection(ctx, msg.CollectionId)
+	if err != nil {
+		return nil, err
+	}
+
+	// check that intents is allowed for the collection
+	if collection.Intents == types.CollectionIntentOptions_deny {
+		return nil, errorsmod.Wrapf(types.ErrIntentUnauthorized, "intents is not allowed for collection %s", msg.CollectionId)
+	}
+
+	agentAddress, err := sdk.AccAddressFromBech32(msg.AgentAddress)
+	if err != nil {
+		return nil, err
+	}
+	adminAddress, err := sdk.AccAddressFromBech32(collection.Admin)
+	if err != nil {
+		return nil, err
+	}
+	// get SubmitClaimAuthorization for agent to use for intent verification
+	authzMsgType := sdk.MsgTypeURL(&types.MsgSubmitClaim{})
+	authz, _ := s.Keeper.AuthzKeeper.GetAuthorization(ctx, agentAddress, adminAddress, authzMsgType)
+
+	// if no authz then return error
+	if authz == nil {
+		return nil, errorsmod.Wrapf(types.ErrIntentUnauthorized, "agent %s does not have authz from this collection %s", msg.AgentAddress, msg.CollectionId)
+	}
+	// get authz constraints for type match
+	var constraints []*types.SubmitClaimConstraints
+	switch k := authz.(type) {
+	case *types.SubmitClaimAuthorization:
+		constraints = k.Constraints
+	default:
+		return nil, fmt.Errorf("existing Authorizations for route %s is not of type SubmitClaimAuthorization", authzMsgType)
+	}
+	// get constraint for collection id
+	var constraint *types.SubmitClaimConstraints
+	for _, con := range constraints {
+		if con.CollectionId == msg.CollectionId {
+			constraint = con
+			break
+		}
+	}
+	// if no authz constraint for collection id then return error
+	if constraint == nil {
+		return nil, errorsmod.Wrapf(types.ErrIntentUnauthorized, "agent %s does not have authz from this collection %s", msg.AgentAddress, msg.CollectionId)
+	}
+
+	// check that intent amount and cw20 payments are within max constraints
+	if !types.IsCoinsInMaxConstraints(msg.Amount, constraint.MaxAmount) {
+		return nil, errorsmod.Wrapf(types.ErrIntentUnauthorized, "intent amount is not within authz max constraints")
+	}
+	if !types.IsCW20PaymentsInMaxConstraints(msg.Cw20Payment, constraint.MaxCw20Payment) {
+		return nil, errorsmod.Wrapf(types.ErrIntentUnauthorized, "intent cw20 payments is not within authz max constraints")
+	}
+
+	// if both amount and cw20 payments are empty then use default payments for APPROVAL
+	if len(msg.Amount) == 0 && len(msg.Cw20Payment) == 0 {
+		msg.Amount = collection.Payments.Approval.Amount
+		msg.Cw20Payment = collection.Payments.Approval.Cw20Payment
+	}
+
+	// if collection approval payment is oracle payment then only native coins allowed
+	if collection.Payments.Approval.IsOraclePayment && !types.IsZeroCW20Payments(msg.Cw20Payment) {
+		return nil, types.ErrOraclePaymentOnlyNative
+	}
+
+	// Get account used for APPROVAL payments on collection
+	approvalAddress, err := sdk.AccAddressFromBech32(collection.Payments.Approval.Account)
+	if err != nil {
+		return nil, err
+	}
+	// Get escrow address
+	escrow, err := sdk.AccAddressFromBech32(collection.EscrowAccount)
+	if err != nil {
+		return nil, err
+	}
+
+	// get intent id from params and update params
+	params := s.Keeper.GetParams(ctx)
+	intentID := params.IntentSequence
+	params.IntentSequence++
+	s.Keeper.SetParams(ctx, &params)
+
+	// create Intent
+	createdDate := ctx.BlockTime()
+	expireAt := createdDate.Add(constraint.IntentDurationNs)
+	intent := types.Intent{
+		Id:            fmt.Sprint(intentID),
+		AgentDid:      msg.AgentDid.Did(),
+		AgentAddress:  msg.AgentAddress,
+		CollectionId:  msg.CollectionId,
+		CreatedAt:     &createdDate,
+		ExpireAt:      &expireAt,
+		Status:        types.IntentStatus_active,
+		Amount:        msg.Amount,
+		Cw20Payment:   msg.Cw20Payment,
+		FromAddress:   approvalAddress.String(),
+		EscrowAddress: escrow.String(),
+	}
+	// transfer the payments to escrow
+	err = s.Keeper.TransferIntentPayments(ctx, approvalAddress, escrow, intent.Amount, intent.Cw20Payment)
+	if err != nil {
+		return nil, errorsmod.Wrap(err, "failed to transfer payments to escrow")
+	}
+
+	// Save the intent and emit the events
+	s.Keeper.SetIntent(ctx, intent)
 	if err := ctx.EventManager().EmitTypedEvents(
-		&types.CollectionUpdatedEvent{
-			Collection: &collection,
+		&types.IntentSubmittedEvent{
+			Intent: &intent,
 		},
 	); err != nil {
 		return nil, err
 	}
 
-	return &types.MsgUpdateCollectionPaymentsResponse{}, nil
+	return &types.MsgClaimIntentResponse{
+		IntentId: intent.Id,
+		ExpireAt: intent.ExpireAt,
+	}, nil
 }
diff --git a/x/claims/keeper/payments.go b/x/claims/keeper/payments.go
index 93f3d7cc..d24428e4 100755
--- a/x/claims/keeper/payments.go
+++ b/x/claims/keeper/payments.go
@@ -10,7 +10,6 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/ixofoundation/ixo-blockchain/v3/x/claims/types"
-	"github.com/ixofoundation/ixo-blockchain/v3/x/token/types/contracts/cw20"
 	"github.com/ixofoundation/ixo-blockchain/v3/x/token/types/contracts/ixo1155"
 )
 
@@ -27,46 +26,26 @@ import (
 // after the native coin payments is calculated, it does the following:
 // 1. if timeout for the payment is nil, it makes the payment by calling payout() function
 // 2. if timeout for the payment is not nil, it creates an authz grant to make the payment by calling createAuthz() function
-func processPayment(ctx sdk.Context, k Keeper, receiver sdk.AccAddress, payment *types.Payment, paymentType types.PaymentType, claimId string) error {
+func processPayment(ctx sdk.Context, k Keeper, receiver sdk.AccAddress, payment *types.Payment, paymentType types.PaymentType, claimId string, collection types.Collection, useIntent bool) error {
 	// check that there is outcome payment to make, otherwise skip this with no error as no payment for action
 	paymentExists := false
-	if !payment.Amount.IsZero() {
+	if !payment.Amount.IsZero() || !types.IsZeroCW20Payments(payment.Cw20Payment) {
 		paymentExists = true
 	}
 	if payment.Contract_1155Payment != nil && payment.Contract_1155Payment.Amount != 0 {
 		paymentExists = true
 	}
-	if payment.Cw20Payment != nil && len(payment.Cw20Payment) > 0 {
-		// map to check if there is any cw20 payments
-		for _, cw20Payment := range payment.Cw20Payment {
-			if cw20Payment.Amount != 0 {
-				paymentExists = true
-				break
-			}
-		}
-	}
 	if !paymentExists {
 		return nil
 	}
 
-	// Get payer address
-	payerAddress, err := sdk.AccAddressFromBech32(payment.Account)
-	if err != nil {
-		return err
+	// if payment is oracle payment then only native coins allowed
+	if payment.IsOraclePayment && (!types.IsZeroCW20Payments(payment.Cw20Payment) || payment.Contract_1155Payment != nil) {
+		return types.ErrOraclePaymentOnlyNative
 	}
 
-	// Not sure if needed as authz can still be created even if sender has no fees
-	// check that sender has enough tokens to make the payment
-	// if !types.HasBalances(ctx, k.BankKeeper, payerAddress, payment.Amount) {
-	// 	return errorsmod.Wrapf(sdkerrors.ErrInsufficientFunds, "sender has insufficient funds")
-	// }
-
-	// get claim and collection payment is for
-	claim, err := k.GetClaim(ctx, claimId)
-	if err != nil {
-		return err
-	}
-	collection, err := k.GetCollection(ctx, claim.CollectionId)
+	// Get payer address
+	payerAddress, err := sdk.AccAddressFromBech32(payment.Account)
 	if err != nil {
 		return err
 	}
@@ -76,8 +55,8 @@ func processPayment(ctx sdk.Context, k Keeper, receiver sdk.AccAddress, payment
 
 	// if there is cosmos coins in payment get input/outputs for multisend
 	if !payment.Amount.IsZero() {
-		// if evaluation payment then do split based on params
-		if paymentType == types.PaymentType_evaluation {
+		// if evaluation payment or oracle payment then do split based on params
+		if paymentType == types.PaymentType_evaluation || payment.IsOraclePayment {
 			params := k.GetParams(ctx)
 
 			// Get node address
@@ -148,9 +127,10 @@ func processPayment(ctx sdk.Context, k Keeper, receiver sdk.AccAddress, payment
 		inputs = append(inputs, banktypes.NewInput(payerAddress, payment.Amount))
 	}
 
-	// if no timeout in payment make payout immediately
-	if payment.TimeoutNs == 0 {
-		if err := payout(ctx, k, inputs, outputs, paymentType, claimId, &time.Time{}, payment.Contract_1155Payment, payment.Cw20Payment, payerAddress, receiver); err != nil {
+	// if no timeout in payment or use intent is true make payout immediately
+	// if use intent then funds is already in escrow account, so no need to wait even if timeout is set
+	if payment.TimeoutNs == 0 || useIntent {
+		if err := payout(ctx, k, inputs, outputs, paymentType, claimId, collection, &time.Time{}, payment.Contract_1155Payment, payment.Cw20Payment, payerAddress, receiver); err != nil {
 			return err
 		}
 	} else {
@@ -177,34 +157,39 @@ func processPayment(ctx sdk.Context, k Keeper, receiver sdk.AccAddress, payment
 // 4. if paymentCw20s is not nil, it makes the payments by calling k.WasmKeeper.Execute()
 // 5. update the claim payment status to success
 // 6. emit PaymentWithdrawnEvent event
-func payout(ctx sdk.Context, k Keeper, inputs []banktypes.Input, outputs []banktypes.Output, paymentType types.PaymentType, claimId string, releaseDate *time.Time, payment1155 *types.Contract1155Payment, paymentCw20s []*types.CW20Payment, fromAddress, toAddress sdk.AccAddress) error {
+func payout(ctx sdk.Context, k Keeper, inputs []banktypes.Input, outputs []banktypes.Output, paymentType types.PaymentType, claimId string, collection types.Collection, releaseDate *time.Time, payment1155 *types.Contract1155Payment, paymentCw20s []*types.CW20Payment, fromAddress, toAddress sdk.AccAddress) error {
 	// get entity payout is for to validate if from address is valid entity module account
-	claim, err := k.GetClaim(ctx, claimId)
-	if err != nil {
-		return err
-	}
-	collection, err := k.GetCollection(ctx, claim.CollectionId)
-	if err != nil {
-		return err
-	}
 	_, entity, err := k.EntityKeeper.ResolveEntity(ctx, collection.Entity)
 	if err != nil {
 		return err
 	}
 
-	// check that fromAddress and input addresses is entity module accounts
-	if !entity.ContainsAccountAddress(fromAddress.String()) {
+	// check that fromAddress and input addresses is entity module accounts or the collections escrow account
+	if !entity.ContainsAccountAddress(fromAddress.String()) && collection.EscrowAccount != fromAddress.String() {
 		return types.ErrCollNotEntityAcc
 	}
 	for _, i := range inputs {
-		if !entity.ContainsAccountAddress(i.Address) {
+		if !entity.ContainsAccountAddress(i.Address) && collection.EscrowAccount != i.Address {
 			return types.ErrCollNotEntityAcc
 		}
 	}
 
+	// clear input[0] list of Coin of any Coin with amount 0, generally validation will already block this,
+	// but we allow it to know when to use collection defaults or when to have no payments, aka amount 0.
+	cleanedInput := banktypes.Input{}
+	if len(inputs) != 0 {
+		cleanedInput.Address = inputs[0].Address
+		for _, coin := range inputs[0].Coins {
+			if coin.Amount.IsPositive() {
+				cleanedInput.Coins = append(cleanedInput.Coins, coin)
+			}
+		}
+	}
+
+	// TODO: Test case where one output will have 0 amount
 	// distribute the payment according to the outputs for Cosmos Coins if has inputs and outputs
-	if len(inputs) != 0 && len(outputs) != 0 {
-		if err := k.BankKeeper.InputOutputCoins(ctx, inputs[0], outputs); err != nil {
+	if len(cleanedInput.Coins) != 0 && len(outputs) != 0 {
+		if err := k.BankKeeper.InputOutputCoins(ctx, cleanedInput, outputs); err != nil {
 			return errorsmod.Wrapf(types.ErrPaymentWithdrawFailed, "%s", err)
 		}
 	}
@@ -243,31 +228,9 @@ func payout(ctx sdk.Context, k Keeper, inputs []banktypes.Input, outputs []bankt
 	// pay cw20 payments if has any
 	if len(paymentCw20s) > 0 {
 		for _, cw20Payment := range paymentCw20s {
-			// make the payments if amount is not 0
+			// if amount not zero, then transfer
 			if cw20Payment.Amount != 0 {
-				encodedTransferMessage, err := cw20.Marshal(cw20.WasmTransfer{
-					Transfer: cw20.Transfer{
-						Recipient: toAddress.String(),
-						Amount:    fmt.Sprint(cw20Payment.Amount),
-					},
-				})
-				if err != nil {
-					return err
-				}
-
-				contractAddress, err := sdk.AccAddressFromBech32(cw20Payment.Address)
-				if err != nil {
-					return err
-				}
-
-				_, err = k.WasmKeeper.Execute(
-					ctx,
-					contractAddress,
-					fromAddress,
-					encodedTransferMessage,
-					sdk.NewCoins(sdk.NewCoin("uixo", math.ZeroInt())),
-				)
-				if err != nil {
+				if err := k.TransferCW20Payment(ctx, fromAddress, toAddress, cw20Payment); err != nil {
 					return err
 				}
 			}
@@ -368,6 +331,7 @@ func createAuthz(ctx sdk.Context, k Keeper, receiver, admin sdk.AccAddress, inpu
 	return nil
 }
 
+// TODO: analyse claims events emited after this change?
 // updatePaymentStatus updates the payment status for the provided different paymentType.
 // it does the following:
 // 1. get claim and payment is for
@@ -401,5 +365,6 @@ func updatePaymentStatus(ctx sdk.Context, k Keeper, paymentType types.PaymentTyp
 	); err != nil {
 		return err
 	}
+
 	return nil
 }
diff --git a/x/claims/module.go b/x/claims/module.go
index 2624c7bf..02283e08 100755
--- a/x/claims/module.go
+++ b/x/claims/module.go
@@ -136,6 +136,13 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw
 	return cdc.MustMarshalJSON(am.keeper.ExportGenesis(ctx))
 }
 
+// EndBlock returns the end blocker for the bonds module. It returns no validator updates.
+func (am AppModule) EndBlock(context context.Context) error {
+	ctx := sdk.UnwrapSDKContext(context)
+	EndBlocker(ctx, am.keeper)
+	return nil
+}
+
 // ConsensusVersion is a sequence number for state-breaking change of the
 // module. It should be incremented on each consensus-breaking change
 // introduced by the module. To avoid wrong/empty versions, the initial version
diff --git a/x/claims/types/authz.go b/x/claims/types/authz.go
index af55a963..e42dad3e 100755
--- a/x/claims/types/authz.go
+++ b/x/claims/types/authz.go
@@ -52,6 +52,12 @@ func (a SubmitClaimAuthorization) ValidateBasic() error {
 		if iidtypes.IsEmpty(constraint.CollectionId) {
 			return sdkerrors.ErrInvalidRequest.Wrap("collection id can't be empty")
 		}
+		if err = ValidateCoinsAllowZero(constraint.MaxAmount.Sort()); err != nil {
+			return errorsmod.Wrapf(sdkerrors.ErrInvalidRequest, "max amounts not valid: (%s)", err)
+		}
+		if err = ValidateCW20Payments(constraint.MaxCw20Payment, true); err != nil {
+			return errorsmod.Wrapf(sdkerrors.ErrInvalidRequest, "max cw20 payments not valid: (%s)", err)
+		}
 	}
 
 	return nil
@@ -80,7 +86,16 @@ func (a SubmitClaimAuthorization) Accept(_ context.Context, msg sdk.Msg) (authz.
 			continue
 		}
 
-		// if reaches here it means there is a matching constraint for the specific batch
+		// if reaches here it means there is a matching constraint for the specific collection
+		// if amount or cw20 payment is defined, check that it is within max constraints
+		if len(mSubmit.Amount) != 0 && !IsCoinsInMaxConstraints(mSubmit.Amount, constraint.MaxAmount) {
+			return authz.AcceptResponse{}, errorsmod.Wrapf(sdkerrors.ErrUnauthorized, "amount is not within max constraints")
+		}
+		if len(mSubmit.Cw20Payment) != 0 && !IsCW20PaymentsInMaxConstraints(mSubmit.Cw20Payment, constraint.MaxCw20Payment) {
+			return authz.AcceptResponse{}, errorsmod.Wrapf(sdkerrors.ErrUnauthorized, "cw20 payments is not within max constraints")
+		}
+
+		// now the collection matches and amount and cw20 payments are within max constraints
 		matched = true
 		// subtract quota by one and if not 0 re-add to constraints, otherwise new quota is 0 so remove from constraints
 		if constraint.AgentQuota > 1 {
@@ -142,11 +157,10 @@ func (a EvaluateClaimAuthorization) ValidateBasic() error {
 		if !iidtypes.IsEmpty(constraint.CollectionId) && len(constraint.ClaimIds) != 0 {
 			return sdkerrors.ErrInvalidRequest.Wrap("constraint must have either a collection_id or some claim ids, not both")
 		}
-		// TODO: test that amount 0 works and test against duplicate denoms (should it be allowed?)
-		if err = constraint.MaxCustomAmount.Sort().Validate(); err != nil {
+		if err = ValidateCoinsAllowZero(constraint.MaxCustomAmount.Sort()); err != nil {
 			return errorsmod.Wrapf(sdkerrors.ErrInvalidRequest, "max custom amounts not valid: (%s)", err)
 		}
-		if err = ValidateCW20Payments(constraint.MaxCustomCw20Payment); err != nil {
+		if err = ValidateCW20Payments(constraint.MaxCustomCw20Payment, true); err != nil {
 			return err
 		}
 	}
@@ -154,7 +168,6 @@ func (a EvaluateClaimAuthorization) ValidateBasic() error {
 	return nil
 }
 
-// TODO: if custom eval amount is 0 then payments are not required? Right now it then maps to collection payments
 // Accept implements Authorization.Accept.
 func (a EvaluateClaimAuthorization) Accept(ctx context.Context, msg sdk.Msg) (authz.AcceptResponse, error) {
 	mEval, ok := msg.(*MsgEvaluateClaim)
@@ -186,24 +199,7 @@ func (a EvaluateClaimAuthorization) Accept(ctx context.Context, msg sdk.Msg) (au
 
 		// check when evaluator defined own custom amounts if is is allowed in constraints
 		if len(mEval.Amount) != 0 {
-			// state for below loop if one msg Amount is invalid whole msg is invalid
-			invalid := false
-			// for each custom amount check if it within allowed max amount
-			for _, mAmount := range mEval.Amount {
-				// state if this specific coin amount is within allowed max
-				valid := false
-				for _, cAmount := range constraint.MaxCustomAmount {
-					// get matching maxCustomAmount by checking denoms, if match then check that message amount must be less than or equal to maxCustomAmount
-					if mAmount.Denom == cAmount.Denom && mAmount.IsLTE(cAmount) {
-						valid = true
-						break
-					}
-				}
-				if !valid {
-					invalid = true
-					break
-				}
-			}
+			invalid := !IsCoinsInMaxConstraints(mEval.Amount, constraint.MaxCustomAmount)
 
 			// if invalid then add constraint back into list
 			if invalid {
@@ -214,29 +210,8 @@ func (a EvaluateClaimAuthorization) Accept(ctx context.Context, msg sdk.Msg) (au
 
 		// check when evaluator defined own custom cw20 payments if is is allowed in constraints
 		if len(mEval.Cw20Payment) != 0 {
-			// first validate that all cw20 payments are valid and no duplicates
-			if err := ValidateCW20Payments(mEval.Cw20Payment); err != nil {
-				return authz.AcceptResponse{}, err
-			}
-			// state for below loop if one msg Cw20Payment is invalid whole msg is invalid
-			invalid := false
-			// for each msg Cw20Payment check if it correlates to a granted constraint
-			for _, mCw20Payment := range mEval.Cw20Payment {
-				// state if this specific Cw20Payment is in the list of constraints
-				valid := false
-				for _, cCw20Payment := range constraint.MaxCustomCw20Payment {
-					// get matching maxCustomCw20Payment by checking addresses, if match then check that message amount must be less than or equal to maxCustomCw20Payment
-					if mCw20Payment.Address == cCw20Payment.Address && mCw20Payment.Amount <= cCw20Payment.Amount {
-						valid = true
-						break
-					}
-				}
-				// if this specific Cw20Payment is not in the list of constraints, then invalid
-				if !valid {
-					invalid = true
-					break
-				}
-			}
+			invalid := !IsCW20PaymentsInMaxConstraints(mEval.Cw20Payment, constraint.MaxCustomCw20Payment)
+
 			// if invalid then add constraint back into list
 			if invalid {
 				unhandledConstraints = append(unhandledConstraints, constraint)
@@ -334,7 +309,7 @@ func (a WithdrawPaymentAuthorization) ValidateBasic() error {
 		if err = constraint.Contract_1155Payment.Validate(); err != nil {
 			return err
 		}
-		if err = ValidateCW20Payments(constraint.Cw20Payment); err != nil {
+		if err = ValidateCW20Payments(constraint.Cw20Payment, true); err != nil {
 			return err
 		}
 	}
@@ -435,10 +410,6 @@ func (a WithdrawPaymentAuthorization) Accept(ctx context.Context, msg sdk.Msg) (
 
 		// if has cw20 payments then check that valid
 		if len(mWith.Cw20Payment) != 0 {
-			// first validate that all cw20 payments are valid and no duplicates
-			if err := ValidateCW20Payments(mWith.Cw20Payment); err != nil {
-				return authz.AcceptResponse{}, err
-			}
 			// then check that for each cw20 payment there is a corresponding constraint cw20 payment
 			for _, mCw20Payment := range mWith.Cw20Payment {
 				// state if this specific cw20Payment is valid
diff --git a/x/claims/types/authz.pb.go b/x/claims/types/authz.pb.go
index f9870f6b..b1c59513 100644
--- a/x/claims/types/authz.pb.go
+++ b/x/claims/types/authz.pb.go
@@ -12,6 +12,7 @@ import (
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types"
+	_ "google.golang.org/protobuf/types/known/durationpb"
 	_ "google.golang.org/protobuf/types/known/timestamppb"
 	io "io"
 	math "math"
@@ -88,6 +89,15 @@ type SubmitClaimConstraints struct {
 	// collection_id indicates to which Collection this claim belongs
 	CollectionId string `protobuf:"bytes,1,opt,name=collection_id,json=collectionId,proto3" json:"collection_id,omitempty"`
 	AgentQuota   uint64 `protobuf:"varint,2,opt,name=agent_quota,json=agentQuota,proto3" json:"agent_quota,omitempty"`
+	// custom max_amount allowed to be specified by service agent for claim
+	// approval, if empty then no custom amount is allowed
+	MaxAmount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=max_amount,json=maxAmount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"max_amount"`
+	// custom max_cw20_payment allowed to be specified by service agent for claim
+	// approval, if empty then no custom amount is allowed
+	MaxCw20Payment []*CW20Payment `protobuf:"bytes,4,rep,name=max_cw20_payment,json=maxCw20Payment,proto3" json:"max_cw20_payment,omitempty"`
+	// intent_duration_ns is the duration for which the intent is active, after
+	// which it will expire (in nanoseconds)
+	IntentDurationNs time.Duration `protobuf:"bytes,5,opt,name=intent_duration_ns,json=intentDurationNs,proto3,stdduration" json:"intent_duration_ns"`
 }
 
 func (m *SubmitClaimConstraints) Reset()         { *m = SubmitClaimConstraints{} }
@@ -137,6 +147,27 @@ func (m *SubmitClaimConstraints) GetAgentQuota() uint64 {
 	return 0
 }
 
+func (m *SubmitClaimConstraints) GetMaxAmount() github_com_cosmos_cosmos_sdk_types.Coins {
+	if m != nil {
+		return m.MaxAmount
+	}
+	return nil
+}
+
+func (m *SubmitClaimConstraints) GetMaxCw20Payment() []*CW20Payment {
+	if m != nil {
+		return m.MaxCw20Payment
+	}
+	return nil
+}
+
+func (m *SubmitClaimConstraints) GetIntentDurationNs() time.Duration {
+	if m != nil {
+		return m.IntentDurationNs
+	}
+	return 0
+}
+
 type EvaluateClaimAuthorization struct {
 	// address of admin
 	Admin       string                      `protobuf:"bytes,1,opt,name=admin,proto3" json:"admin,omitempty"`
@@ -465,57 +496,61 @@ func init() {
 func init() { proto.RegisterFile("ixo/claims/v1beta1/authz.proto", fileDescriptor_f4b7f6c531e101a6) }
 
 var fileDescriptor_f4b7f6c531e101a6 = []byte{
-	// 787 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcb, 0x6e, 0xdb, 0x46,
-	0x14, 0x15, 0x2d, 0xf9, 0xa1, 0xa1, 0xda, 0xa2, 0x53, 0xb7, 0xa5, 0x65, 0x83, 0x12, 0x54, 0xa0,
-	0x15, 0x8a, 0x9a, 0xb4, 0x64, 0x18, 0xe8, 0x63, 0x25, 0xa9, 0x5d, 0x18, 0x28, 0x12, 0x87, 0x36,
-	0x62, 0x20, 0x01, 0x42, 0x0c, 0xc9, 0x91, 0x34, 0x90, 0xc8, 0x51, 0xc8, 0xa1, 0x25, 0xfb, 0x2b,
-	0x9c, 0x5d, 0xbe, 0x20, 0x0b, 0x2f, 0xb2, 0xca, 0x47, 0x18, 0x59, 0x79, 0x99, 0x55, 0x1c, 0xd8,
-	0x3f, 0x12, 0x70, 0x38, 0xa4, 0x64, 0x99, 0x06, 0x04, 0x78, 0x25, 0xdd, 0xc7, 0xb9, 0x73, 0x74,
-	0xee, 0xb9, 0x10, 0x50, 0xc9, 0x84, 0xea, 0xf6, 0x10, 0x11, 0x37, 0xd0, 0x4f, 0x1a, 0x16, 0x66,
-	0xa8, 0xa1, 0xa3, 0x90, 0xf5, 0xcf, 0xb4, 0x91, 0x4f, 0x19, 0x85, 0x90, 0x4c, 0xa8, 0x16, 0xd7,
-	0x35, 0x51, 0x2f, 0xaf, 0xf7, 0x68, 0x8f, 0xf2, 0xb2, 0x1e, 0x7d, 0x8b, 0x3b, 0xcb, 0x1b, 0x36,
-	0x0d, 0x5c, 0x1a, 0x98, 0x71, 0x21, 0x0e, 0x44, 0xa9, 0xd2, 0xa3, 0xb4, 0x37, 0xc4, 0x3a, 0x8f,
-	0xac, 0xb0, 0xab, 0x33, 0xe2, 0xe2, 0x80, 0x21, 0x77, 0x24, 0x1a, 0xd4, 0xb8, 0x5d, 0xb7, 0x50,
-	0x80, 0x53, 0x1a, 0x36, 0x25, 0x5e, 0x32, 0x20, 0x83, 0xa5, 0x20, 0x35, 0x3f, 0xc0, 0x1b, 0xa4,
-	0x1d, 0x51, 0x10, 0xd7, 0x6b, 0xef, 0x24, 0xa0, 0x1c, 0x86, 0x96, 0x4b, 0x58, 0x27, 0x82, 0xb5,
-	0x42, 0xd6, 0xa7, 0x3e, 0x39, 0x43, 0x8c, 0x50, 0x0f, 0xae, 0x83, 0x65, 0xe4, 0xb8, 0xc4, 0x53,
-	0xa4, 0xaa, 0x54, 0x2f, 0x1a, 0x71, 0x00, 0xff, 0x07, 0xb2, 0x4d, 0xbd, 0x80, 0xf9, 0x88, 0x78,
-	0x2c, 0x50, 0x96, 0xaa, 0xf9, 0xba, 0xdc, 0xfc, 0x5d, 0xbb, 0xaf, 0x87, 0x36, 0x33, 0xb8, 0x33,
-	0x45, 0x18, 0xb3, 0xf0, 0xbf, 0x7f, 0xfd, 0xf8, 0x61, 0xbb, 0x26, 0x44, 0x89, 0xf5, 0x4d, 0xd0,
-	0x77, 0xb8, 0xd4, 0x5e, 0x81, 0x9f, 0xb2, 0xc7, 0xc1, 0x5f, 0xc0, 0x37, 0x36, 0x1d, 0x0e, 0xb1,
-	0x1d, 0xf5, 0x99, 0xc4, 0x11, 0x6c, 0x4b, 0xd3, 0xe4, 0xbe, 0x03, 0x2b, 0x40, 0x46, 0x3d, 0xec,
-	0x31, 0xf3, 0x75, 0x48, 0x19, 0x52, 0x96, 0xaa, 0x52, 0xbd, 0x60, 0x00, 0x9e, 0x7a, 0x16, 0x65,
-	0x6a, 0x17, 0x12, 0x28, 0xff, 0x77, 0x82, 0x86, 0x21, 0x62, 0x78, 0x61, 0x29, 0x9e, 0x64, 0x49,
-	0xf1, 0x47, 0x96, 0x14, 0x77, 0x46, 0x3f, 0x5a, 0x8c, 0x37, 0x79, 0xa0, 0x3c, 0x34, 0x71, 0x31,
-	0x3d, 0x36, 0x41, 0x91, 0x33, 0x34, 0x89, 0x13, 0xf3, 0x2e, 0x1a, 0x6b, 0x3c, 0xb1, 0xef, 0x04,
-	0xf3, 0x62, 0xe5, 0xe7, 0xc5, 0x82, 0x2d, 0x20, 0x5b, 0xb8, 0x4b, 0x7d, 0x6c, 0x3a, 0x88, 0x61,
-	0xa5, 0x50, 0x95, 0xea, 0x72, 0xb3, 0xac, 0xc5, 0x6e, 0xd6, 0x12, 0x37, 0x6b, 0x47, 0x89, 0x9b,
-	0xdb, 0x85, 0xf3, 0xeb, 0x8a, 0x64, 0x80, 0x18, 0xf4, 0x2f, 0x62, 0x18, 0x8e, 0xc1, 0xf7, 0x2e,
-	0x9a, 0x98, 0x76, 0x18, 0x30, 0xea, 0x9a, 0xc8, 0xa5, 0xa1, 0xc7, 0x14, 0xc0, 0x05, 0xdc, 0xd0,
-	0x84, 0x04, 0x91, 0xeb, 0x53, 0x05, 0x3a, 0x94, 0x78, 0xed, 0x9d, 0xcb, 0xcf, 0x95, 0xdc, 0xc5,
-	0x75, 0xa5, 0xde, 0x23, 0xac, 0x1f, 0x5a, 0x9a, 0x4d, 0x5d, 0x71, 0x51, 0xe2, 0x63, 0x3b, 0x70,
-	0x06, 0x3a, 0x3b, 0x1d, 0xe1, 0x80, 0x03, 0x02, 0xe3, 0x3b, 0x17, 0x4d, 0x3a, 0xfc, 0x91, 0x16,
-	0x7f, 0x03, 0x3e, 0x07, 0x3f, 0xcf, 0x3c, 0x6c, 0x8f, 0x9b, 0x3b, 0xe6, 0x08, 0x9d, 0xba, 0xd8,
-	0x63, 0x8a, 0xcc, 0x9f, 0xaf, 0x64, 0xed, 0xaf, 0x73, 0xdc, 0xdc, 0x39, 0x88, 0xdb, 0x8c, 0xf5,
-	0x74, 0x64, 0x67, 0x9c, 0x66, 0x6b, 0xef, 0x25, 0xb0, 0x75, 0x4c, 0x58, 0xdf, 0xf1, 0xd1, 0x58,
-	0xe4, 0x16, 0xb1, 0xd0, 0x41, 0x96, 0x85, 0xb4, 0x2c, 0x0a, 0x73, 0xc3, 0x1f, 0x6d, 0xa2, 0xb7,
-	0x05, 0x50, 0x7e, 0x78, 0x26, 0xdc, 0x00, 0x6b, 0x89, 0x43, 0x04, 0xe3, 0x55, 0x61, 0x10, 0xf8,
-	0x27, 0x58, 0x21, 0xde, 0x28, 0x4c, 0xe9, 0x96, 0xa7, 0x0b, 0xf3, 0x06, 0xe9, 0x6b, 0xfb, 0x51,
-	0x4b, 0xbb, 0x10, 0x6d, 0xcc, 0x10, 0xfd, 0xf0, 0x1f, 0xb0, 0x4a, 0x43, 0xc6, 0xa1, 0x79, 0x0e,
-	0xdd, 0xcc, 0x84, 0x3e, 0xe5, 0x3d, 0x02, 0x9b, 0x20, 0x60, 0x1b, 0x94, 0xc4, 0xa6, 0xcc, 0x68,
-	0xc3, 0xdc, 0x76, 0xdf, 0x66, 0xaf, 0x4b, 0xfc, 0x9e, 0xa3, 0xd3, 0x11, 0x36, 0xe4, 0xd1, 0x34,
-	0x80, 0x2f, 0xc1, 0x8f, 0x36, 0xf5, 0x98, 0x8f, 0x6c, 0x66, 0x36, 0x1a, 0x7b, 0x7b, 0xe9, 0xee,
-	0x97, 0xb9, 0x87, 0x7f, 0xcb, 0xdc, 0xbd, 0x00, 0x44, 0xfd, 0x89, 0x07, 0x7e, 0xb0, 0xef, 0x27,
-	0xe1, 0x16, 0x28, 0x32, 0xda, 0x72, 0x1c, 0x1f, 0x07, 0x81, 0xb2, 0xc2, 0x35, 0x9b, 0x26, 0x60,
-	0x15, 0xc8, 0x5d, 0x9f, 0xba, 0x49, 0x7d, 0x95, 0xd7, 0x67, 0x53, 0xb0, 0x03, 0x4a, 0x3e, 0x1e,
-	0x62, 0x14, 0x88, 0xbb, 0x5a, 0x5b, 0xf0, 0xae, 0x64, 0x81, 0xe2, 0x87, 0xd5, 0x06, 0xa5, 0x3b,
-	0xa6, 0x2e, 0x2e, 0x66, 0x6a, 0xd9, 0x9e, 0x7a, 0xb9, 0x7d, 0x78, 0x79, 0xa3, 0x4a, 0x57, 0x37,
-	0xaa, 0xf4, 0xe5, 0x46, 0x95, 0xce, 0x6f, 0xd5, 0xdc, 0xd5, 0xad, 0x9a, 0xfb, 0x74, 0xab, 0xe6,
-	0x5e, 0xfc, 0x35, 0x73, 0x78, 0x64, 0x42, 0xbb, 0x34, 0xf4, 0x1c, 0x6e, 0xa7, 0x28, 0xda, 0xb6,
-	0x86, 0xd4, 0x1e, 0xd8, 0x7d, 0x44, 0x3c, 0xfd, 0x64, 0x57, 0x9f, 0x24, 0xff, 0x4c, 0xfc, 0x1e,
-	0xad, 0x15, 0xce, 0x7f, 0xf7, 0x6b, 0x00, 0x00, 0x00, 0xff, 0xff, 0xec, 0x0e, 0x70, 0x48, 0x5a,
-	0x07, 0x00, 0x00,
+	// 859 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x4d, 0x6f, 0xdb, 0x36,
+	0x18, 0xc7, 0xa3, 0xc4, 0x4d, 0x62, 0x2a, 0xeb, 0x3a, 0x2e, 0xdb, 0x14, 0xb7, 0x90, 0x0d, 0x0f,
+	0xd8, 0x8c, 0x61, 0x91, 0xe2, 0x14, 0x05, 0xf6, 0x72, 0xb2, 0xdd, 0x1d, 0x0c, 0x0c, 0x5d, 0xab,
+	0x16, 0x2b, 0xb0, 0x1d, 0x04, 0x4a, 0xa2, 0x6d, 0xce, 0x16, 0xe9, 0x89, 0x54, 0xec, 0xf4, 0x53,
+	0x74, 0xb7, 0x7e, 0x82, 0x1d, 0x7a, 0xd8, 0x69, 0x1f, 0xa2, 0xd8, 0xa9, 0xc7, 0x9d, 0xd6, 0x21,
+	0xb9, 0xec, 0x63, 0x0c, 0xa4, 0x28, 0xd9, 0x8e, 0x55, 0xc0, 0x40, 0x7a, 0x4a, 0xf8, 0xbc, 0xfe,
+	0xf9, 0x3c, 0x3f, 0xca, 0xc0, 0x26, 0x73, 0xe6, 0x86, 0x13, 0x44, 0x62, 0xee, 0x9e, 0xb5, 0x03,
+	0x2c, 0x50, 0xdb, 0x45, 0xa9, 0x18, 0x3d, 0x73, 0xa6, 0x09, 0x13, 0x0c, 0x42, 0x32, 0x67, 0x4e,
+	0xe6, 0x77, 0xb4, 0xbf, 0x76, 0x38, 0x64, 0x43, 0xa6, 0xdc, 0xae, 0xfc, 0x2f, 0x8b, 0xac, 0x1d,
+	0x85, 0x8c, 0xc7, 0x8c, 0xfb, 0x99, 0x23, 0x3b, 0x68, 0x57, 0x7d, 0xc8, 0xd8, 0x70, 0x82, 0x5d,
+	0x75, 0x0a, 0xd2, 0x81, 0x2b, 0x48, 0x8c, 0xb9, 0x40, 0xf1, 0x54, 0x07, 0xd8, 0x59, 0xb8, 0x1b,
+	0x20, 0x8e, 0x0b, 0x19, 0x21, 0x23, 0x34, 0x2f, 0x50, 0xa2, 0x52, 0x8b, 0xd2, 0x05, 0xae, 0x76,
+	0x88, 0xd2, 0x04, 0x09, 0xc2, 0xe8, 0x5a, 0x03, 0x3a, 0x2e, 0x2a, 0xc8, 0x43, 0xe6, 0x6f, 0xfe,
+	0x6e, 0x00, 0xeb, 0x71, 0x1a, 0xc4, 0x44, 0xf4, 0x64, 0xd9, 0x4e, 0x2a, 0x46, 0x2c, 0x21, 0xcf,
+	0x54, 0x09, 0x78, 0x08, 0x6e, 0xa0, 0x28, 0x26, 0xd4, 0x32, 0x1a, 0x46, 0xab, 0xea, 0x65, 0x07,
+	0xf8, 0x3d, 0x30, 0x43, 0x46, 0xb9, 0x48, 0x10, 0xa1, 0x82, 0x5b, 0xdb, 0x8d, 0x9d, 0x96, 0x79,
+	0xfa, 0x85, 0xb3, 0x3e, 0x2f, 0x67, 0xa9, 0x70, 0x6f, 0x91, 0xe1, 0x2d, 0xa7, 0x7f, 0xf3, 0xd9,
+	0x5f, 0x7f, 0x1e, 0x37, 0xf5, 0xd0, 0xb2, 0xf9, 0xe7, 0xd9, 0x2b, 0x5a, 0x9a, 0xff, 0x6d, 0x83,
+	0x8f, 0xcb, 0xeb, 0xc1, 0x4f, 0xc1, 0x7b, 0x21, 0x9b, 0x4c, 0x70, 0x28, 0x03, 0x7d, 0x12, 0x69,
+	0xb9, 0x07, 0x0b, 0x63, 0x3f, 0x82, 0x75, 0x60, 0xa2, 0x21, 0xa6, 0xc2, 0xff, 0x35, 0x65, 0x02,
+	0x59, 0xdb, 0x0d, 0xa3, 0x55, 0xf1, 0x80, 0x32, 0x3d, 0x92, 0x16, 0xf8, 0x0b, 0x00, 0x31, 0x9a,
+	0xfb, 0x28, 0x66, 0x29, 0x15, 0xd6, 0x8e, 0xba, 0xd5, 0x91, 0xa3, 0x95, 0xc9, 0xfd, 0x14, 0xc2,
+	0x7a, 0x8c, 0xd0, 0xee, 0xc9, 0xab, 0x7f, 0xea, 0x5b, 0x2f, 0xdf, 0xd4, 0x5b, 0x43, 0x22, 0x46,
+	0x69, 0xe0, 0x84, 0x2c, 0xd6, 0xbb, 0xd7, 0x7f, 0x8e, 0x79, 0x34, 0x76, 0xc5, 0xf9, 0x14, 0x73,
+	0x95, 0xc0, 0xbd, 0x6a, 0x8c, 0xe6, 0x1d, 0x55, 0x1d, 0xf6, 0xc1, 0x2d, 0xd9, 0x2b, 0x9c, 0x9d,
+	0x9e, 0xf8, 0x53, 0x74, 0x1e, 0x63, 0x2a, 0xac, 0x8a, 0xea, 0x58, 0x2f, 0x9b, 0x63, 0xef, 0xe9,
+	0xe9, 0xc9, 0xc3, 0x2c, 0xcc, 0xbb, 0x19, 0xa3, 0x79, 0x6f, 0x56, 0x9c, 0xe1, 0x23, 0x00, 0x09,
+	0x15, 0xf2, 0x62, 0xf9, 0xe6, 0x7d, 0xca, 0xad, 0x1b, 0x0d, 0x43, 0xc9, 0xcf, 0xe8, 0x70, 0x72,
+	0x3a, 0x9c, 0xfb, 0x3a, 0xa6, 0xbb, 0x2f, 0xe5, 0xbf, 0x78, 0x53, 0x37, 0xbc, 0x5b, 0x59, 0x7a,
+	0xee, 0x79, 0xc0, 0x9b, 0x2f, 0x0d, 0x50, 0xfb, 0xee, 0x0c, 0x4d, 0x52, 0x24, 0xf0, 0xc6, 0x54,
+	0x3c, 0x28, 0xa3, 0xe2, 0xcb, 0xb2, 0xdb, 0xac, 0x94, 0xbe, 0x36, 0x17, 0xbf, 0xed, 0x00, 0xeb,
+	0x6d, 0x15, 0x37, 0x23, 0xe3, 0x36, 0xa8, 0x2a, 0x85, 0x3e, 0x89, 0x32, 0xdd, 0x55, 0x6f, 0x5f,
+	0x19, 0xfa, 0x11, 0xbf, 0x8a, 0xcd, 0xce, 0x1a, 0x36, 0x1d, 0x60, 0x06, 0x78, 0xc0, 0x12, 0xec,
+	0x47, 0x48, 0x60, 0xab, 0xa2, 0x06, 0x5f, 0x5b, 0x1b, 0xfc, 0x93, 0xfc, 0xe1, 0x77, 0x2b, 0xcf,
+	0xe5, 0xd4, 0x41, 0x96, 0x74, 0x1f, 0x09, 0x0c, 0x67, 0xe0, 0x03, 0x45, 0x43, 0xca, 0x05, 0x8b,
+	0x73, 0x00, 0xc1, 0xbb, 0x07, 0xf0, 0x7d, 0x89, 0x8e, 0x6a, 0xa2, 0x31, 0xfc, 0x11, 0x7c, 0xb2,
+	0xd4, 0x78, 0x85, 0x46, 0x73, 0x33, 0x1a, 0x0f, 0x8b, 0x92, 0x4b, 0x4c, 0x36, 0xff, 0x30, 0xc0,
+	0x9d, 0xa7, 0x44, 0x8c, 0xa2, 0x04, 0xcd, 0xb4, 0x6d, 0x13, 0x84, 0x1e, 0x96, 0x21, 0xe4, 0x94,
+	0x49, 0xb8, 0x52, 0xfc, 0xda, 0x10, 0xbd, 0xa8, 0x80, 0xda, 0xdb, 0x6b, 0xc2, 0x23, 0xb0, 0x9f,
+	0x13, 0xa2, 0x15, 0xef, 0x69, 0x40, 0xe0, 0x57, 0x60, 0x97, 0xd0, 0x69, 0x5a, 0xc8, 0xad, 0x2d,
+	0x16, 0x46, 0xc7, 0x45, 0xb7, 0xbe, 0x0c, 0xe9, 0x56, 0xe4, 0xc6, 0x3c, 0x1d, 0x0f, 0xbf, 0x05,
+	0x7b, 0x2c, 0x15, 0x2a, 0x35, 0xfb, 0xd8, 0xdc, 0x2e, 0x4d, 0xfd, 0x41, 0xc5, 0xe8, 0xdc, 0x3c,
+	0x03, 0x76, 0xc1, 0x81, 0xde, 0x94, 0x2f, 0x37, 0xac, 0xb0, 0xbb, 0x59, 0xbe, 0x2e, 0x7d, 0x9f,
+	0x27, 0xe7, 0x53, 0xec, 0x99, 0xd3, 0xc5, 0x01, 0xfe, 0x0c, 0x3e, 0x0a, 0x19, 0x15, 0x09, 0x0a,
+	0x85, 0xdf, 0x6e, 0xdf, 0xbb, 0x57, 0xec, 0x3e, 0xfb, 0x78, 0x7c, 0x5e, 0xba, 0x7b, 0x9d, 0x20,
+	0xe3, 0x73, 0x06, 0x3e, 0x0c, 0xd7, 0x8d, 0xf0, 0x0e, 0xa8, 0x0a, 0xd6, 0x89, 0xa2, 0x04, 0x73,
+	0x6e, 0xed, 0xaa, 0x99, 0x2d, 0x0c, 0xb0, 0x01, 0xcc, 0x41, 0xc2, 0xe2, 0xdc, 0xbf, 0xa7, 0xfc,
+	0xcb, 0x26, 0xd8, 0x03, 0x07, 0x09, 0x9e, 0x60, 0xc4, 0xf5, 0xbb, 0xda, 0xdf, 0xf0, 0x5d, 0x99,
+	0x3a, 0x4b, 0x3d, 0xac, 0x2e, 0x38, 0x58, 0x81, 0xba, 0xba, 0x19, 0xd4, 0x66, 0xb8, 0x60, 0xb9,
+	0xfb, 0xf8, 0xd5, 0x85, 0x6d, 0xbc, 0xbe, 0xb0, 0x8d, 0x7f, 0x2f, 0x6c, 0xe3, 0xf9, 0xa5, 0xbd,
+	0xf5, 0xfa, 0xd2, 0xde, 0xfa, 0xfb, 0xd2, 0xde, 0xfa, 0xe9, 0xeb, 0xa5, 0x87, 0x47, 0xe6, 0x6c,
+	0xc0, 0x52, 0x1a, 0x29, 0x9c, 0xe4, 0xe9, 0x38, 0x98, 0xb0, 0x70, 0x1c, 0x8e, 0x10, 0xa1, 0xee,
+	0xd9, 0x5d, 0x77, 0x9e, 0xff, 0x88, 0xab, 0xf7, 0x18, 0xec, 0x2a, 0xfd, 0x77, 0xff, 0x0f, 0x00,
+	0x00, 0xff, 0xff, 0x27, 0x09, 0xe5, 0xd7, 0x85, 0x08, 0x00, 0x00,
 }
 
 func (m *SubmitClaimAuthorization) Marshal() (dAtA []byte, err error) {
@@ -582,6 +617,42 @@ func (m *SubmitClaimConstraints) MarshalToSizedBuffer(dAtA []byte) (int, error)
 	_ = i
 	var l int
 	_ = l
+	n1, err1 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.IntentDurationNs, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.IntentDurationNs):])
+	if err1 != nil {
+		return 0, err1
+	}
+	i -= n1
+	i = encodeVarintAuthz(dAtA, i, uint64(n1))
+	i--
+	dAtA[i] = 0x2a
+	if len(m.MaxCw20Payment) > 0 {
+		for iNdEx := len(m.MaxCw20Payment) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.MaxCw20Payment[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintAuthz(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x22
+		}
+	}
+	if len(m.MaxAmount) > 0 {
+		for iNdEx := len(m.MaxAmount) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.MaxAmount[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintAuthz(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x1a
+		}
+	}
 	if m.AgentQuota != 0 {
 		i = encodeVarintAuthz(dAtA, i, uint64(m.AgentQuota))
 		i--
@@ -690,12 +761,12 @@ func (m *EvaluateClaimConstraints) MarshalToSizedBuffer(dAtA []byte) (int, error
 		}
 	}
 	if m.BeforeDate != nil {
-		n1, err1 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(*m.BeforeDate, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.BeforeDate):])
-		if err1 != nil {
-			return 0, err1
+		n2, err2 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(*m.BeforeDate, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.BeforeDate):])
+		if err2 != nil {
+			return 0, err2
 		}
-		i -= n1
-		i = encodeVarintAuthz(dAtA, i, uint64(n1))
+		i -= n2
+		i = encodeVarintAuthz(dAtA, i, uint64(n2))
 		i--
 		dAtA[i] = 0x22
 	}
@@ -802,12 +873,12 @@ func (m *WithdrawPaymentConstraints) MarshalToSizedBuffer(dAtA []byte) (int, err
 		}
 	}
 	if m.ReleaseDate != nil {
-		n2, err2 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(*m.ReleaseDate, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.ReleaseDate):])
-		if err2 != nil {
-			return 0, err2
+		n3, err3 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(*m.ReleaseDate, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.ReleaseDate):])
+		if err3 != nil {
+			return 0, err3
 		}
-		i -= n2
-		i = encodeVarintAuthz(dAtA, i, uint64(n2))
+		i -= n3
+		i = encodeVarintAuthz(dAtA, i, uint64(n3))
 		i--
 		dAtA[i] = 0x42
 	}
@@ -923,6 +994,20 @@ func (m *SubmitClaimConstraints) Size() (n int) {
 	if m.AgentQuota != 0 {
 		n += 1 + sovAuthz(uint64(m.AgentQuota))
 	}
+	if len(m.MaxAmount) > 0 {
+		for _, e := range m.MaxAmount {
+			l = e.Size()
+			n += 1 + l + sovAuthz(uint64(l))
+		}
+	}
+	if len(m.MaxCw20Payment) > 0 {
+		for _, e := range m.MaxCw20Payment {
+			l = e.Size()
+			n += 1 + l + sovAuthz(uint64(l))
+		}
+	}
+	l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.IntentDurationNs)
+	n += 1 + l + sovAuthz(uint64(l))
 	return n
 }
 
@@ -1254,6 +1339,107 @@ func (m *SubmitClaimConstraints) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field MaxAmount", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowAuthz
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthAuthz
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthAuthz
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.MaxAmount = append(m.MaxAmount, types.Coin{})
+			if err := m.MaxAmount[len(m.MaxAmount)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field MaxCw20Payment", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowAuthz
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthAuthz
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthAuthz
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.MaxCw20Payment = append(m.MaxCw20Payment, &CW20Payment{})
+			if err := m.MaxCw20Payment[len(m.MaxCw20Payment)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 5:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field IntentDurationNs", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowAuthz
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthAuthz
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthAuthz
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.IntentDurationNs, dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipAuthz(dAtA[iNdEx:])
diff --git a/x/claims/types/claims.go b/x/claims/types/claims.go
index 197ad259..6be62119 100755
--- a/x/claims/types/claims.go
+++ b/x/claims/types/claims.go
@@ -6,6 +6,7 @@ import (
 	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	entitytypes "github.com/ixofoundation/ixo-blockchain/v3/x/entity/types"
 	iidtypes "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types"
@@ -63,6 +64,32 @@ func IsValidDispute(dispute *Dispute) bool {
 	return true
 }
 
+// IsValidIntent tells if a Intent is valid,
+func IsValidIntent(intent *Intent) bool {
+	if intent == nil {
+		return false
+	}
+	if iidtypes.IsEmpty(intent.AgentDid) {
+		return false
+	}
+	if iidtypes.IsEmpty(intent.Id) {
+		return false
+	}
+	_, err := sdk.AccAddressFromBech32(intent.AgentAddress)
+	if err != nil {
+		return false
+	}
+	if iidtypes.IsEmpty(intent.CollectionId) {
+		return false
+	}
+	_, err = sdk.AccAddressFromBech32(intent.FromAddress)
+	if err != nil {
+		return false
+	}
+	_, err = sdk.AccAddressFromBech32(intent.EscrowAddress)
+	return err == nil
+}
+
 func HasBalances(ctx sdk.Context, bankKeeper bankkeeper.Keeper, payerAddr sdk.AccAddress,
 	requiredFunds sdk.Coins) bool {
 	for _, coin := range requiredFunds {
@@ -76,35 +103,49 @@ func HasBalances(ctx sdk.Context, bankKeeper bankkeeper.Keeper, payerAddr sdk.Ac
 
 func (p *Contract1155Payment) Validate() error {
 	if p != nil {
-		_, err := sdk.AccAddressFromBech32(p.Address)
-		if err != nil {
-			return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "err %s", err)
-		}
-		if iidtypes.IsEmpty(p.TokenId) {
-			return fmt.Errorf("token id cannot be empty")
-		}
-		// if p.Contract_1155Payment.Amount == 0 {
-		// 	return fmt.Errorf("token amount cannot be 0")
+		// temporarily disable using 1155 tokens for payments
+		return fmt.Errorf("contract_1155_payment is currently disabled (not allowed)")
+
+		// _, err := sdk.AccAddressFromBech32(p.Address)
+		// if err != nil {
+		// 	return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "err %s", err)
+		// }
+		// if iidtypes.IsEmpty(p.TokenId) {
+		// 	return fmt.Errorf("token id cannot be empty")
 		// }
+		// // if p.Contract_1155Payment.Amount == 0 {
+		// // 	return fmt.Errorf("token amount cannot be 0")
+		// // }
 	}
 
 	return nil
 }
 
-func (p Payment) Validate() error {
+func (p Payment) Validate(allowOraclePayments bool) error {
 	_, err := sdk.AccAddressFromBech32(p.Account)
 	if err != nil {
 		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "err %s", err)
 	}
 
+	if !allowOraclePayments && p.IsOraclePayment {
+		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "oracle payments is only allowed for APPROVAL payments")
+	}
+
+	// if is oracle payment then only native coins allowed
+	if p.IsOraclePayment && (!IsZeroCW20Payments(p.Cw20Payment) || p.Contract_1155Payment != nil) {
+		return ErrOraclePaymentOnlyNative
+	}
+
 	if err = p.Contract_1155Payment.Validate(); err != nil {
 		return err
 	}
 
-	if err = ValidateCW20Payments(p.Cw20Payment); err != nil {
+	// no 0 amounts allowed, otherwise unnnecesary 0 amount payments
+	if err = ValidateCW20Payments(p.Cw20Payment, false); err != nil {
 		return err
 	}
 
+	// no 0 amounts allowed, otherwise unnnecesary 0 amount payments
 	if err = p.Amount.Sort().Validate(); err != nil {
 		return errorsmod.Wrapf(sdkerrors.ErrInvalidRequest, "amounts not valid: (%s)", err)
 	}
@@ -129,16 +170,16 @@ func (p Payments) Validate() error {
 		return ErrCollectionEvalCW20Error
 	}
 
-	if err := p.Submission.Validate(); err != nil {
+	if err := p.Submission.Validate(false); err != nil {
 		return err
 	}
-	if err := p.Evaluation.Validate(); err != nil {
+	if err := p.Evaluation.Validate(false); err != nil {
 		return err
 	}
-	if err := p.Approval.Validate(); err != nil {
+	if err := p.Approval.Validate(true); err != nil {
 		return err
 	}
-	if err := p.Rejection.Validate(); err != nil {
+	if err := p.Rejection.Validate(false); err != nil {
 		return err
 	}
 
@@ -162,6 +203,7 @@ func (p *Payment) Clone() *Payment {
 		Amount:               p.Amount,
 		Contract_1155Payment: contract1155Payment,
 		TimeoutNs:            p.TimeoutNs,
+		IsOraclePayment:      p.IsOraclePayment,
 	}
 
 	if p.Cw20Payment != nil {
@@ -181,3 +223,90 @@ func (p *Payment) Clone() *Payment {
 
 	return cloned
 }
+
+// Helper to get module account key in form of claims_escrow_{collectionId}
+func GetModuleAccountKeyEscrow(collectionId string) string {
+	return ModuleName + "_escrow_" + collectionId
+}
+
+// Helper to get module account address
+func GetModuleAccountAddressEscrow(collectionId string) sdk.AccAddress {
+	return authtypes.NewModuleAddress(GetModuleAccountKeyEscrow(collectionId))
+}
+
+// IsCoinsInMaxConstraints checks if the provided coins are within the max constraints
+func IsCoinsInMaxConstraints(coins sdk.Coins, maxCoins sdk.Coins) bool {
+	maxCoinsMap := make(map[string]sdk.Coin)
+	for _, maxCoin := range maxCoins {
+		maxCoinsMap[maxCoin.Denom] = maxCoin
+	}
+
+	for _, coin := range coins {
+		maxCoin, ok := maxCoinsMap[coin.Denom]
+		if !ok || !coin.IsLTE(maxCoin) {
+			return false
+		}
+	}
+	return true
+}
+
+func IsCW20PaymentsInMaxConstraints(cw20Payments []*CW20Payment, maxCw20Payments []*CW20Payment) bool {
+	maxPaymentsMap := make(map[string]*CW20Payment)
+	for _, maxPayment := range maxCw20Payments {
+		maxPaymentsMap[maxPayment.Address] = maxPayment
+	}
+
+	for _, payment := range cw20Payments {
+		maxPayment, ok := maxPaymentsMap[payment.Address]
+		if !ok || payment.Amount > maxPayment.Amount {
+			return false
+		}
+	}
+	return true
+}
+
+// Validate checks that the Coins are sorted, have positive amount or zero, with a valid and unique
+// denomination (i.e no duplicates). Otherwise, it returns an error. Copied from sdk.Coins.Validate()
+func ValidateCoinsAllowZero(coins sdk.Coins) error {
+	switch len(coins) {
+	case 0:
+		return nil
+
+	case 1:
+		if err := sdk.ValidateDenom(coins[0].Denom); err != nil {
+			return err
+		}
+		if coins[0].IsNegative() {
+			return fmt.Errorf("coin %s amount is negative", coins[0])
+		}
+		return nil
+
+	default:
+		// check single coin case
+		if err := ValidateCoinsAllowZero(sdk.Coins{coins[0]}); err != nil {
+			return err
+		}
+
+		lowDenom := coins[0].Denom
+
+		for _, coin := range coins[1:] {
+			if err := sdk.ValidateDenom(coin.Denom); err != nil {
+				return err
+			}
+			if coin.Denom < lowDenom {
+				return fmt.Errorf("denomination %s is not sorted", coin.Denom)
+			}
+			if coin.Denom == lowDenom {
+				return fmt.Errorf("duplicate denomination %s", coin.Denom)
+			}
+			if coin.IsNegative() {
+				return fmt.Errorf("coin %s amount is negative", coin.Denom)
+			}
+
+			// we compare each coin against the last denom
+			lowDenom = coin.Denom
+		}
+
+		return nil
+	}
+}
diff --git a/x/claims/types/claims.pb.go b/x/claims/types/claims.pb.go
index 3a9639c6..0de9cda7 100644
--- a/x/claims/types/claims.pb.go
+++ b/x/claims/types/claims.pb.go
@@ -60,6 +60,39 @@ func (CollectionState) EnumDescriptor() ([]byte, []int) {
 	return fileDescriptor_619c1a0876cd0592, []int{0}
 }
 
+type CollectionIntentOptions int32
+
+const (
+	// Allow: Intents can be made for claims, but claims can also be made without
+	// intents.
+	CollectionIntentOptions_allow CollectionIntentOptions = 0
+	// Deny: Intents cannot be made for claims for the collection.
+	CollectionIntentOptions_deny CollectionIntentOptions = 1
+	// Required: Claims cannot be made without an associated intent. An intent is
+	// mandatory before a claim can be submitted.
+	CollectionIntentOptions_required CollectionIntentOptions = 2
+)
+
+var CollectionIntentOptions_name = map[int32]string{
+	0: "ALLOW",
+	1: "DENY",
+	2: "REQUIRED",
+}
+
+var CollectionIntentOptions_value = map[string]int32{
+	"ALLOW":    0,
+	"DENY":     1,
+	"REQUIRED": 2,
+}
+
+func (x CollectionIntentOptions) String() string {
+	return proto.EnumName(CollectionIntentOptions_name, int32(x))
+}
+
+func (CollectionIntentOptions) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_619c1a0876cd0592, []int{1}
+}
+
 type EvaluationStatus int32
 
 const (
@@ -91,7 +124,42 @@ func (x EvaluationStatus) String() string {
 }
 
 func (EvaluationStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_619c1a0876cd0592, []int{1}
+	return fileDescriptor_619c1a0876cd0592, []int{2}
+}
+
+type IntentStatus int32
+
+const (
+	// Active: Intent is created and active, payments have been transferred to
+	// escrow if there is any
+	IntentStatus_active IntentStatus = 0
+	// Fulfilled: Intent is fulfilled, was used to create a claim and funds will
+	// be released on claim APPROVAL, or funds will be reverted on claim REJECTION
+	// or DISPUTE
+	IntentStatus_fulfilled IntentStatus = 1
+	// Expired: Intent has expired, payments have been transferred back out of
+	// escrow
+	IntentStatus_expired IntentStatus = 2
+)
+
+var IntentStatus_name = map[int32]string{
+	0: "ACTIVE",
+	1: "FULFILLED",
+	2: "EXPIRED",
+}
+
+var IntentStatus_value = map[string]int32{
+	"ACTIVE":    0,
+	"FULFILLED": 1,
+	"EXPIRED":   2,
+}
+
+func (x IntentStatus) String() string {
+	return proto.EnumName(IntentStatus_name, int32(x))
+}
+
+func (IntentStatus) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_619c1a0876cd0592, []int{3}
 }
 
 type PaymentType int32
@@ -122,19 +190,25 @@ func (x PaymentType) String() string {
 }
 
 func (PaymentType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_619c1a0876cd0592, []int{2}
+	return fileDescriptor_619c1a0876cd0592, []int{4}
 }
 
 type PaymentStatus int32
 
 const (
 	PaymentStatus_no_payment PaymentStatus = 0
-	PaymentStatus_promised   PaymentStatus = 1
+	// Promised: Agent is contracted to receive payment
+	PaymentStatus_promised PaymentStatus = 1
+	// Authorized: Authz set up, no guarantee
 	PaymentStatus_authorized PaymentStatus = 2
+	// Guaranteed: Escrow set up with funds blocked
 	PaymentStatus_guaranteed PaymentStatus = 3
-	PaymentStatus_paid       PaymentStatus = 4
-	PaymentStatus_failed     PaymentStatus = 5
-	PaymentStatus_disputed   PaymentStatus = 6
+	// Paid: Funds have been paid
+	PaymentStatus_paid PaymentStatus = 4
+	// Failed: Payment failed, most probably due to insufficient funds
+	PaymentStatus_failed PaymentStatus = 5
+	// DisputedPayment: Payment disputed
+	PaymentStatus_disputed PaymentStatus = 6
 )
 
 var PaymentStatus_name = map[int32]string{
@@ -162,7 +236,7 @@ func (x PaymentStatus) String() string {
 }
 
 func (PaymentStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_619c1a0876cd0592, []int{3}
+	return fileDescriptor_619c1a0876cd0592, []int{5}
 }
 
 type Params struct {
@@ -170,6 +244,7 @@ type Params struct {
 	IxoAccount           string                      `protobuf:"bytes,2,opt,name=ixo_account,json=ixoAccount,proto3" json:"ixo_account,omitempty"`
 	NetworkFeePercentage cosmossdk_io_math.LegacyDec `protobuf:"bytes,3,opt,name=network_fee_percentage,json=networkFeePercentage,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"network_fee_percentage"`
 	NodeFeePercentage    cosmossdk_io_math.LegacyDec `protobuf:"bytes,4,opt,name=node_fee_percentage,json=nodeFeePercentage,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"node_fee_percentage"`
+	IntentSequence       uint64                      `protobuf:"varint,5,opt,name=intent_sequence,json=intentSequence,proto3" json:"intent_sequence,omitempty"`
 }
 
 func (m *Params) Reset()         { *m = Params{} }
@@ -219,6 +294,13 @@ func (m *Params) GetIxoAccount() string {
 	return ""
 }
 
+func (m *Params) GetIntentSequence() uint64 {
+	if m != nil {
+		return m.IntentSequence
+	}
+	return 0
+}
+
 type Collection struct {
 	// collection id is the incremented internal id for the collection of claims
 	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
@@ -260,6 +342,13 @@ type Collection struct {
 	// invalidated is the number of claims that have been evaluated as invalid
 	// (internally calculated)
 	Invalidated uint64 `protobuf:"varint,16,opt,name=invalidated,proto3" json:"invalidated,omitempty"`
+	// escrow_account is the escrow account address for this collection created at
+	// collection creation, current purpose is to transfer payments to escrow
+	// account for GUARANTEED payments through intents
+	EscrowAccount string `protobuf:"bytes,17,opt,name=escrow_account,json=escrowAccount,proto3" json:"escrow_account,omitempty"`
+	// intents is the option for intents for this collection (allow, deny,
+	// required)
+	Intents CollectionIntentOptions `protobuf:"varint,18,opt,name=intents,proto3,enum=ixo.claims.v1beta1.CollectionIntentOptions" json:"intents,omitempty"`
 }
 
 func (m *Collection) Reset()         { *m = Collection{} }
@@ -407,6 +496,20 @@ func (m *Collection) GetInvalidated() uint64 {
 	return 0
 }
 
+func (m *Collection) GetEscrowAccount() string {
+	if m != nil {
+		return m.EscrowAccount
+	}
+	return ""
+}
+
+func (m *Collection) GetIntents() CollectionIntentOptions {
+	if m != nil {
+		return m.Intents
+	}
+	return CollectionIntentOptions_allow
+}
+
 type Payments struct {
 	Submission *Payment `protobuf:"bytes,1,opt,name=submission,proto3" json:"submission,omitempty"`
 	Evaluation *Payment `protobuf:"bytes,2,opt,name=evaluation,proto3" json:"evaluation,omitempty"`
@@ -486,6 +589,10 @@ type Payment struct {
 	TimeoutNs time.Duration `protobuf:"bytes,4,opt,name=timeout_ns,json=timeoutNs,proto3,stdduration" json:"timeout_ns"`
 	// cw20 payments, can be empty or multiple
 	Cw20Payment []*CW20Payment `protobuf:"bytes,5,rep,name=cw20_payment,json=cw20Payment,proto3" json:"cw20_payment,omitempty"`
+	// boolean to indicate if the payment is for oracle payments, aka it will go
+	// through network fees split NOTE: if true the payment can only have amount
+	// values(Native coins), no cw20 payments allowed then
+	IsOraclePayment bool `protobuf:"varint,6,opt,name=is_oracle_payment,json=isOraclePayment,proto3" json:"is_oracle_payment,omitempty"`
 }
 
 func (m *Payment) Reset()         { *m = Payment{} }
@@ -556,6 +663,13 @@ func (m *Payment) GetCw20Payment() []*CW20Payment {
 	return nil
 }
 
+func (m *Payment) GetIsOraclePayment() bool {
+	if m != nil {
+		return m.IsOraclePayment
+	}
+	return false
+}
+
 type Contract1155Payment struct {
 	Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
 	TokenId string `protobuf:"bytes,2,opt,name=token_id,json=tokenId,proto3" json:"token_id,omitempty"`
@@ -681,8 +795,18 @@ type Claim struct {
 	// claimID is the unique identifier of the claim in the cid hash format
 	ClaimId string `protobuf:"bytes,5,opt,name=claim_id,json=claimId,proto3" json:"claim_id,omitempty"`
 	// evaluation is the result of one or more claim evaluations
-	Evaluation     *Evaluation    `protobuf:"bytes,6,opt,name=evaluation,proto3" json:"evaluation,omitempty"`
+	Evaluation *Evaluation `protobuf:"bytes,6,opt,name=evaluation,proto3" json:"evaluation,omitempty"`
+	// payments_status is the status of the payments for the claim
 	PaymentsStatus *ClaimPayments `protobuf:"bytes,7,opt,name=payments_status,json=paymentsStatus,proto3" json:"payments_status,omitempty"`
+	// intent_id is the id of the intent for this claim, if any
+	UseIntent bool `protobuf:"varint,8,opt,name=use_intent,json=useIntent,proto3" json:"use_intent,omitempty"`
+	// NOTE: if both amount and cw20 amount are empty then use default by
+	// Collection custom amount specified by service agent for claim approval
+	Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,9,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount"`
+	// NOTE: if both amount and cw20 amount are empty then use default by
+	// Collection custom cw20 payments specified by service agent for claim
+	// approval
+	Cw20Payment []*CW20Payment `protobuf:"bytes,10,rep,name=cw20_payment,json=cw20Payment,proto3" json:"cw20_payment,omitempty"`
 }
 
 func (m *Claim) Reset()         { *m = Claim{} }
@@ -767,6 +891,27 @@ func (m *Claim) GetPaymentsStatus() *ClaimPayments {
 	return nil
 }
 
+func (m *Claim) GetUseIntent() bool {
+	if m != nil {
+		return m.UseIntent
+	}
+	return false
+}
+
+func (m *Claim) GetAmount() github_com_cosmos_cosmos_sdk_types.Coins {
+	if m != nil {
+		return m.Amount
+	}
+	return nil
+}
+
+func (m *Claim) GetCw20Payment() []*CW20Payment {
+	if m != nil {
+		return m.Cw20Payment
+	}
+	return nil
+}
+
 type ClaimPayments struct {
 	Submission PaymentStatus `protobuf:"varint,1,opt,name=submission,proto3,enum=ixo.claims.v1beta1.PaymentStatus" json:"submission,omitempty"`
 	Evaluation PaymentStatus `protobuf:"varint,2,opt,name=evaluation,proto3,enum=ixo.claims.v1beta1.PaymentStatus" json:"evaluation,omitempty"`
@@ -857,11 +1002,10 @@ type Evaluation struct {
 	// evaluationDate is the date and time that the claim evaluation was submitted
 	// on-chain
 	EvaluationDate *time.Time `protobuf:"bytes,9,opt,name=evaluation_date,json=evaluationDate,proto3,stdtime" json:"evaluation_date,omitempty"`
-	// custom amount specified by evaluator for claim approval, if empty list then
-	// use default by Collection
+	// if both amount and cw20 amount are empty then use default by Collection
+	// custom amount specified by evaluator for claim approval
 	Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,10,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount"`
-	// custom cw20 payments specified by evaluator for claim approval, if empty
-	// list then use default by Collection
+	// custom cw20 payments specified by evaluator for claim approval
 	Cw20Payment []*CW20Payment `protobuf:"bytes,11,rep,name=cw20_payment,json=cw20Payment,proto3" json:"cw20_payment,omitempty"`
 }
 
@@ -1104,9 +1248,157 @@ func (m *DisputeData) GetEncrypted() bool {
 	return false
 }
 
+// Intent defines the structure for a service agent's claim intent.
+type Intent struct {
+	// id is the incremented internal id for the intent
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	// The service agent's DID (Decentralized Identifier).
+	AgentDid string `protobuf:"bytes,2,opt,name=agent_did,json=agentDid,proto3" json:"agent_did,omitempty"`
+	// The service agent's address.
+	AgentAddress string `protobuf:"bytes,3,opt,name=agent_address,json=agentAddress,proto3" json:"agent_address,omitempty"`
+	// The id of the collection this intent is linked to.
+	CollectionId string `protobuf:"bytes,4,opt,name=collection_id,json=collectionId,proto3" json:"collection_id,omitempty"`
+	// claim_id (optional, set when claim is submitted)
+	ClaimId string `protobuf:"bytes,5,opt,name=claim_id,json=claimId,proto3" json:"claim_id,omitempty"`
+	// The time the intent was created.
+	CreatedAt *time.Time `protobuf:"bytes,6,opt,name=created_at,json=createdAt,proto3,stdtime" json:"created_at,omitempty"`
+	// Timeout period for the intent. If the claim is not submitted by this time,
+	// the intent expires.
+	ExpireAt *time.Time `protobuf:"bytes,7,opt,name=expire_at,json=expireAt,proto3,stdtime" json:"expire_at,omitempty"`
+	// Status of the intent (e.g., "ACTIVE" or "FULFILLED").
+	Status IntentStatus `protobuf:"varint,8,opt,name=status,proto3,enum=ixo.claims.v1beta1.IntentStatus" json:"status,omitempty"`
+	// The payment amount the agent intends to claim, if any.
+	Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,9,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount"`
+	// The CW20Payment amount the agent intends to claim, if any.
+	Cw20Payment []*CW20Payment `protobuf:"bytes,10,rep,name=cw20_payment,json=cw20Payment,proto3" json:"cw20_payment,omitempty"`
+	// the address the escrow payment came from
+	FromAddress string `protobuf:"bytes,11,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"`
+	// the escrow account address
+	EscrowAddress string `protobuf:"bytes,12,opt,name=escrow_address,json=escrowAddress,proto3" json:"escrow_address,omitempty"`
+}
+
+func (m *Intent) Reset()         { *m = Intent{} }
+func (m *Intent) String() string { return proto.CompactTextString(m) }
+func (*Intent) ProtoMessage()    {}
+func (*Intent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_619c1a0876cd0592, []int{11}
+}
+func (m *Intent) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *Intent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_Intent.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *Intent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent.Merge(m, src)
+}
+func (m *Intent) XXX_Size() int {
+	return m.Size()
+}
+func (m *Intent) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent proto.InternalMessageInfo
+
+func (m *Intent) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
+}
+
+func (m *Intent) GetAgentDid() string {
+	if m != nil {
+		return m.AgentDid
+	}
+	return ""
+}
+
+func (m *Intent) GetAgentAddress() string {
+	if m != nil {
+		return m.AgentAddress
+	}
+	return ""
+}
+
+func (m *Intent) GetCollectionId() string {
+	if m != nil {
+		return m.CollectionId
+	}
+	return ""
+}
+
+func (m *Intent) GetClaimId() string {
+	if m != nil {
+		return m.ClaimId
+	}
+	return ""
+}
+
+func (m *Intent) GetCreatedAt() *time.Time {
+	if m != nil {
+		return m.CreatedAt
+	}
+	return nil
+}
+
+func (m *Intent) GetExpireAt() *time.Time {
+	if m != nil {
+		return m.ExpireAt
+	}
+	return nil
+}
+
+func (m *Intent) GetStatus() IntentStatus {
+	if m != nil {
+		return m.Status
+	}
+	return IntentStatus_active
+}
+
+func (m *Intent) GetAmount() github_com_cosmos_cosmos_sdk_types.Coins {
+	if m != nil {
+		return m.Amount
+	}
+	return nil
+}
+
+func (m *Intent) GetCw20Payment() []*CW20Payment {
+	if m != nil {
+		return m.Cw20Payment
+	}
+	return nil
+}
+
+func (m *Intent) GetFromAddress() string {
+	if m != nil {
+		return m.FromAddress
+	}
+	return ""
+}
+
+func (m *Intent) GetEscrowAddress() string {
+	if m != nil {
+		return m.EscrowAddress
+	}
+	return ""
+}
+
 func init() {
 	proto.RegisterEnum("ixo.claims.v1beta1.CollectionState", CollectionState_name, CollectionState_value)
+	proto.RegisterEnum("ixo.claims.v1beta1.CollectionIntentOptions", CollectionIntentOptions_name, CollectionIntentOptions_value)
 	proto.RegisterEnum("ixo.claims.v1beta1.EvaluationStatus", EvaluationStatus_name, EvaluationStatus_value)
+	proto.RegisterEnum("ixo.claims.v1beta1.IntentStatus", IntentStatus_name, IntentStatus_value)
 	proto.RegisterEnum("ixo.claims.v1beta1.PaymentType", PaymentType_name, PaymentType_value)
 	proto.RegisterEnum("ixo.claims.v1beta1.PaymentStatus", PaymentStatus_name, PaymentStatus_value)
 	proto.RegisterType((*Params)(nil), "ixo.claims.v1beta1.Params")
@@ -1120,114 +1412,135 @@ func init() {
 	proto.RegisterType((*Evaluation)(nil), "ixo.claims.v1beta1.Evaluation")
 	proto.RegisterType((*Dispute)(nil), "ixo.claims.v1beta1.Dispute")
 	proto.RegisterType((*DisputeData)(nil), "ixo.claims.v1beta1.DisputeData")
+	proto.RegisterType((*Intent)(nil), "ixo.claims.v1beta1.Intent")
 }
 
 func init() { proto.RegisterFile("ixo/claims/v1beta1/claims.proto", fileDescriptor_619c1a0876cd0592) }
 
 var fileDescriptor_619c1a0876cd0592 = []byte{
-	// 1622 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcb, 0x6f, 0x1a, 0xd7,
-	0x1a, 0xf7, 0x60, 0xc0, 0xf0, 0xe1, 0x07, 0x39, 0xf6, 0x8d, 0x30, 0xc9, 0x05, 0x2e, 0xb9, 0xd2,
-	0xb5, 0x2c, 0x19, 0x62, 0x47, 0xd1, 0xbd, 0xb9, 0x69, 0x1b, 0x0d, 0x86, 0xa4, 0x44, 0x0e, 0x46,
-	0x83, 0x9d, 0xaa, 0xe9, 0x02, 0x1d, 0xcf, 0x1c, 0xe3, 0x53, 0xc3, 0x1c, 0x32, 0x0f, 0xc7, 0xee,
-	0x3f, 0x50, 0xc9, 0xab, 0x6c, 0x2a, 0x75, 0x63, 0xb5, 0xea, 0xa2, 0x8b, 0xee, 0x2a, 0xf5, 0x8f,
-	0xc8, 0x32, 0xea, 0xaa, 0x6a, 0xa5, 0x24, 0x4a, 0x36, 0xdd, 0x74, 0xdf, 0x65, 0x75, 0x1e, 0xc3,
-	0x00, 0x46, 0x89, 0x15, 0xa9, 0x2b, 0xf3, 0x3d, 0x7e, 0xdf, 0xf9, 0xce, 0xf7, 0xf8, 0xcd, 0x31,
-	0xe4, 0xe9, 0x31, 0x2b, 0x9b, 0x5d, 0x4c, 0x7b, 0x6e, 0xf9, 0x68, 0x7d, 0x8f, 0x78, 0x78, 0x5d,
-	0x89, 0xa5, 0xbe, 0xc3, 0x3c, 0x86, 0x10, 0x3d, 0x66, 0x25, 0xa5, 0x51, 0x0e, 0xd9, 0xa5, 0x0e,
-	0xeb, 0x30, 0x61, 0x2e, 0xf3, 0x5f, 0xd2, 0x33, 0x9b, 0xef, 0x30, 0xd6, 0xe9, 0x92, 0xb2, 0x90,
-	0xf6, 0xfc, 0xfd, 0xb2, 0x47, 0x7b, 0xc4, 0xf5, 0x70, 0xaf, 0xaf, 0x1c, 0x72, 0x26, 0x73, 0x7b,
-	0xcc, 0x2d, 0xef, 0x61, 0x97, 0x84, 0x87, 0x31, 0x6a, 0x07, 0xf6, 0xf1, 0x00, 0x96, 0xef, 0x60,
-	0x8f, 0xb2, 0xc0, 0xbe, 0x2c, 0xf1, 0x6d, 0x79, 0xb2, 0x14, 0xa4, 0xa9, 0xf8, 0x7d, 0x04, 0xe2,
-	0x4d, 0xec, 0xe0, 0x9e, 0x8b, 0xca, 0xb0, 0x68, 0xb2, 0x6e, 0x97, 0x98, 0x1c, 0xd9, 0x76, 0xc9,
-	0x63, 0x9f, 0xd8, 0x26, 0xc9, 0x68, 0x05, 0x6d, 0x25, 0x6a, 0xa0, 0xd0, 0xd4, 0x52, 0x16, 0x94,
-	0x87, 0x14, 0x3d, 0x66, 0x6d, 0x6c, 0x9a, 0xcc, 0xb7, 0xbd, 0x4c, 0xa4, 0xa0, 0xad, 0x24, 0x0d,
-	0xa0, 0xc7, 0x4c, 0x97, 0x1a, 0xd4, 0x81, 0xcb, 0x36, 0xf1, 0x9e, 0x30, 0xe7, 0xb0, 0xbd, 0x4f,
-	0x48, 0xbb, 0x4f, 0x1c, 0x93, 0xd8, 0x1e, 0xee, 0x90, 0xcc, 0x34, 0xf7, 0xad, 0xac, 0x3f, 0x7b,
-	0x91, 0x9f, 0xfa, 0xf5, 0x45, 0xfe, 0x8a, 0x4c, 0xc9, 0xb5, 0x0e, 0x4b, 0x94, 0x95, 0x7b, 0xd8,
-	0x3b, 0x28, 0x6d, 0x91, 0x0e, 0x36, 0x4f, 0xaa, 0xc4, 0xfc, 0xf9, 0xa7, 0x35, 0x50, 0x19, 0x57,
-	0x89, 0x69, 0x2c, 0xa9, 0x80, 0x77, 0x09, 0x69, 0x0e, 0xc2, 0x21, 0x0c, 0x8b, 0x36, 0xb3, 0xc8,
-	0xf8, 0x29, 0xd1, 0xf7, 0x3d, 0xe5, 0x12, 0x8f, 0x36, 0x72, 0x44, 0xf1, 0xc7, 0x28, 0xc0, 0xe6,
-	0xa0, 0x06, 0x68, 0x1e, 0x22, 0xd4, 0x12, 0xb5, 0x49, 0x1a, 0x11, 0x6a, 0xa1, 0xcb, 0x10, 0x27,
-	0xb6, 0x47, 0xbd, 0x13, 0x55, 0x06, 0x25, 0xa1, 0x25, 0x88, 0x61, 0xab, 0x47, 0x6d, 0x79, 0x63,
-	0x43, 0x0a, 0x28, 0x0b, 0x09, 0x51, 0x7e, 0x93, 0x75, 0x65, 0x92, 0xc6, 0x40, 0x46, 0x77, 0x00,
-	0x5c, 0x0f, 0x3b, 0x5e, 0xdb, 0xc2, 0x1e, 0xc9, 0xc4, 0x0a, 0xda, 0x4a, 0x6a, 0x23, 0x5b, 0x92,
-	0x1d, 0x2e, 0x05, 0x1d, 0x2e, 0xed, 0x04, 0x23, 0x52, 0x89, 0x3e, 0x7d, 0x99, 0xd7, 0x8c, 0xa4,
-	0xc0, 0x54, 0xb1, 0x47, 0xd0, 0x6d, 0x48, 0x10, 0xdb, 0x92, 0xf0, 0xf8, 0x05, 0xe1, 0x33, 0xc4,
-	0xb6, 0x04, 0x78, 0x09, 0x62, 0x8f, 0x7d, 0xe6, 0xe1, 0xcc, 0x8c, 0x68, 0xbb, 0x14, 0xb8, 0x56,
-	0xf6, 0x38, 0x21, 0xb5, 0xb2, 0xbd, 0x57, 0x21, 0x49, 0x8e, 0x70, 0xd7, 0xc7, 0x1e, 0xb1, 0x32,
-	0x49, 0x61, 0x09, 0x15, 0xfc, 0x8e, 0xb8, 0xdf, 0x77, 0xd8, 0x11, 0xb1, 0x32, 0x20, 0x8c, 0x03,
-	0x99, 0xdb, 0x1c, 0xf2, 0x39, 0x31, 0x39, 0x30, 0x25, 0x6d, 0x81, 0xcc, 0x6d, 0x16, 0x75, 0xfb,
-	0x3e, 0xb7, 0xcd, 0x4a, 0x5b, 0x20, 0xa3, 0x5b, 0x10, 0x73, 0x3d, 0x7e, 0xaf, 0xb9, 0x82, 0xb6,
-	0x32, 0xbf, 0x71, 0xad, 0x74, 0x7e, 0xc7, 0x4a, 0x61, 0x93, 0x5a, 0xdc, 0xd5, 0x90, 0x08, 0xf4,
-	0x3f, 0x48, 0xf4, 0xf1, 0x49, 0x8f, 0xd8, 0x9e, 0x9b, 0x99, 0x17, 0x55, 0xb9, 0x3a, 0x09, 0xdd,
-	0x54, 0x3e, 0xc6, 0xc0, 0x9b, 0xb7, 0xd6, 0xa5, 0x1d, 0x9b, 0x38, 0x99, 0x05, 0xd9, 0x5a, 0x29,
-	0xa1, 0x02, 0xa4, 0xa8, 0x7d, 0x84, 0xbb, 0xd4, 0x12, 0x05, 0x48, 0x8b, 0x5c, 0x87, 0x55, 0xc5,
-	0x3f, 0x35, 0x48, 0x04, 0x01, 0xd1, 0x6d, 0x00, 0xd7, 0xdf, 0xeb, 0x51, 0xd7, 0xa5, 0xcc, 0x16,
-	0x93, 0x93, 0xda, 0xb8, 0xf2, 0x96, 0x14, 0x8c, 0x21, 0x77, 0x0e, 0x56, 0x95, 0xe5, 0xe0, 0xc8,
-	0x05, 0xc0, 0xa1, 0x3b, 0xfa, 0x6f, 0xd0, 0x09, 0xdc, 0x15, 0x63, 0xf8, 0x0e, 0xe8, 0xc0, 0x19,
-	0xdd, 0x82, 0xa4, 0x6c, 0x0b, 0x3f, 0x34, 0xfa, 0x6e, 0x64, 0xe8, 0x5d, 0xfc, 0x23, 0x02, 0x33,
-	0x4a, 0x8d, 0x32, 0x30, 0x13, 0x70, 0x84, 0x5c, 0x98, 0x40, 0x44, 0x26, 0xc4, 0x71, 0x4f, 0x91,
-	0xc7, 0xf4, 0x4a, 0x6a, 0x63, 0xb9, 0xa4, 0x96, 0x90, 0x33, 0xdd, 0x50, 0x47, 0xa9, 0x5d, 0xb9,
-	0xce, 0xb7, 0xf8, 0x87, 0x97, 0xf9, 0x95, 0x0e, 0xf5, 0x0e, 0xfc, 0xbd, 0x92, 0xc9, 0x7a, 0x8a,
-	0xc9, 0xd4, 0x9f, 0x35, 0xd7, 0x3a, 0x2c, 0x7b, 0x27, 0x7d, 0xe2, 0x0a, 0x80, 0x6b, 0xa8, 0xd0,
-	0xe8, 0x33, 0xf8, 0x87, 0xc9, 0x6c, 0xcf, 0xc1, 0xa6, 0xd7, 0x5e, 0x5f, 0xbf, 0x79, 0xb3, 0xad,
-	0x3a, 0xab, 0x6a, 0xf1, 0x9f, 0xc9, 0x43, 0x24, 0x01, 0xdc, 0x3f, 0xb8, 0xdd, 0xa2, 0x79, 0x5e,
-	0x89, 0x2a, 0x00, 0x9c, 0xad, 0x99, 0xef, 0xb5, 0x6d, 0x57, 0xd5, 0x68, 0xf9, 0xdc, 0xba, 0x55,
-	0x15, 0x1f, 0x57, 0x12, 0xfc, 0x16, 0x5f, 0x8b, 0x85, 0x55, 0xb0, 0x86, 0x8b, 0x2a, 0x30, 0x6b,
-	0x3e, 0xd9, 0xb8, 0x3e, 0xc8, 0x2b, 0x26, 0x6a, 0x91, 0x9f, 0x98, 0xd7, 0x27, 0x1b, 0xd7, 0x83,
-	0x7c, 0x52, 0x1c, 0xa4, 0x84, 0xe2, 0x01, 0x2c, 0x4e, 0xc8, 0x59, 0x94, 0xde, 0xb2, 0x1c, 0xe2,
-	0xba, 0x83, 0xd2, 0x4b, 0x11, 0x2d, 0x43, 0xc2, 0x63, 0x87, 0xc4, 0x6e, 0x53, 0x4b, 0x51, 0xd6,
-	0x8c, 0x90, 0xeb, 0x82, 0xcb, 0x54, 0x57, 0x78, 0x85, 0xe6, 0x82, 0x42, 0xfe, 0x3f, 0xfa, 0xfb,
-	0xb7, 0x79, 0xad, 0x58, 0x83, 0xd4, 0x50, 0x16, 0x6f, 0x39, 0x61, 0x34, 0x4c, 0x74, 0x2c, 0xcc,
-	0xab, 0x08, 0xc4, 0x36, 0xf9, 0xe5, 0xd0, 0x35, 0x98, 0x1b, 0xfa, 0xee, 0x0c, 0x58, 0x75, 0x36,
-	0x54, 0xd6, 0x2d, 0x74, 0x05, 0x92, 0xb8, 0x43, 0x6c, 0xaf, 0x6d, 0x0d, 0xf2, 0x4d, 0x08, 0x45,
-	0x95, 0x5a, 0x3c, 0x82, 0x34, 0x06, 0x99, 0x48, 0xb2, 0x9d, 0x15, 0x4a, 0x5d, 0xa5, 0x53, 0x87,
-	0x85, 0x70, 0xa1, 0x24, 0x3b, 0x46, 0x2f, 0xc8, 0x8e, 0xf3, 0x21, 0x50, 0x90, 0xe4, 0x32, 0x24,
-	0x44, 0x5f, 0x78, 0xb2, 0x31, 0x79, 0x69, 0x21, 0xd7, 0x2d, 0xf4, 0xd1, 0xc8, 0xa2, 0x4a, 0xfa,
-	0xcd, 0x4d, 0xea, 0x64, 0x6d, 0xe0, 0x35, 0xb2, 0xab, 0xf7, 0x61, 0x21, 0x20, 0x9e, 0x36, 0x27,
-	0x2e, 0xdf, 0x15, 0x4c, 0x9c, 0xda, 0xf8, 0xd7, 0xc4, 0x71, 0xe0, 0xe2, 0x80, 0xb2, 0xe6, 0x03,
-	0x64, 0x4b, 0x00, 0x8b, 0x5f, 0x45, 0x60, 0x6e, 0xc4, 0x03, 0xe9, 0xe7, 0x38, 0x68, 0x7e, 0x72,
-	0x60, 0x85, 0x90, 0x81, 0x46, 0x98, 0x48, 0x3f, 0xc7, 0x44, 0x17, 0x0b, 0x31, 0x74, 0xc7, 0x0f,
-	0xc7, 0xf8, 0xe8, 0x42, 0x01, 0x42, 0x56, 0xba, 0x33, 0xce, 0x4a, 0x17, 0xc2, 0x0f, 0x71, 0xd3,
-	0x37, 0x51, 0x80, 0xb0, 0xfc, 0x23, 0xdd, 0xd4, 0x46, 0xbb, 0x79, 0x6e, 0x34, 0x23, 0x13, 0x46,
-	0xf3, 0x32, 0xc4, 0x99, 0x83, 0xcd, 0xae, 0x7a, 0xd5, 0x18, 0x4a, 0x1a, 0x1d, 0xd9, 0xe8, 0xbb,
-	0x46, 0x36, 0x36, 0x61, 0x64, 0x3f, 0x80, 0xb8, 0x9a, 0x81, 0xb8, 0xb8, 0xe6, 0xbf, 0xdf, 0x3e,
-	0x48, 0xea, 0xa6, 0x0a, 0xc3, 0xf3, 0x72, 0x08, 0x76, 0x99, 0x2d, 0x26, 0x68, 0xce, 0x50, 0x12,
-	0x5a, 0x03, 0x74, 0x44, 0x1c, 0xba, 0x4f, 0x4d, 0x81, 0xe2, 0xaf, 0x42, 0xb6, 0x2f, 0xbe, 0xec,
-	0x49, 0xe3, 0xd2, 0xb0, 0xa5, 0xc9, 0x0d, 0x7c, 0x6f, 0xc2, 0xde, 0xc9, 0xbd, 0x49, 0x5e, 0x74,
-	0x6f, 0x42, 0xa0, 0xd8, 0x9b, 0x90, 0xee, 0xe1, 0xef, 0xa3, 0xfb, 0x71, 0x36, 0x4d, 0xbd, 0x07,
-	0x9b, 0x3e, 0x86, 0x99, 0xaa, 0x7c, 0x73, 0xa0, 0x7f, 0x8a, 0x95, 0xe1, 0xa3, 0x13, 0xce, 0x47,
-	0x52, 0x69, 0xea, 0x16, 0x42, 0x10, 0xe5, 0x49, 0x88, 0xc1, 0x88, 0x19, 0xe2, 0x37, 0xba, 0x01,
-	0x51, 0x0b, 0x7b, 0x58, 0x7d, 0x5f, 0x26, 0x9e, 0xac, 0xa2, 0x57, 0xb1, 0x87, 0x0d, 0xe1, 0x5c,
-	0xec, 0x40, 0x6a, 0x48, 0x89, 0xd2, 0x30, 0xed, 0x3b, 0x54, 0x9d, 0xc7, 0x7f, 0x8e, 0x9c, 0x94,
-	0x54, 0x27, 0x2d, 0x41, 0x4c, 0x76, 0x4f, 0xbd, 0x2e, 0x85, 0x20, 0xde, 0x65, 0xb6, 0xe9, 0x9c,
-	0xf4, 0xf9, 0xb3, 0x84, 0x0f, 0x5e, 0xc2, 0x08, 0x15, 0xab, 0xbb, 0xb0, 0x30, 0xf6, 0x44, 0xe2,
-	0xa1, 0xb7, 0x9b, 0xb5, 0x46, 0x7a, 0x2a, 0x9b, 0x38, 0x3d, 0x2b, 0x44, 0x59, 0x9f, 0xd8, 0x7c,
-	0x7a, 0x9a, 0xfa, 0x6e, 0xab, 0x56, 0x4d, 0x6b, 0x59, 0x38, 0x3d, 0x2b, 0xc4, 0xfb, 0xd8, 0x77,
-	0x89, 0x98, 0xf6, 0xcd, 0xad, 0x6d, 0xae, 0x8f, 0x48, 0xbd, 0xd9, 0x65, 0x2e, 0xb1, 0x56, 0xbf,
-	0xd3, 0x20, 0x3d, 0x3e, 0x8a, 0xfc, 0xe3, 0xd0, 0xac, 0x35, 0xaa, 0xf5, 0xc6, 0xbd, 0xf4, 0x54,
-	0x36, 0x75, 0x7a, 0x56, 0x98, 0xe9, 0x13, 0xdb, 0xa2, 0x76, 0x87, 0xbf, 0xf2, 0xf4, 0x66, 0xd3,
-	0xd8, 0x7e, 0x28, 0x0e, 0x98, 0x3d, 0x3d, 0x2b, 0x8c, 0xbc, 0x0e, 0x8d, 0xda, 0xfd, 0xda, 0xe6,
-	0x8e, 0x38, 0x44, 0xd8, 0x86, 0x5f, 0x87, 0xd5, 0x7a, 0xab, 0xb9, 0xcb, 0x6d, 0xd3, 0xd2, 0x36,
-	0x78, 0x1d, 0x16, 0x20, 0x55, 0x6f, 0x3c, 0xd4, 0xb7, 0xea, 0x55, 0x9d, 0x9b, 0xa3, 0xd9, 0x85,
-	0xd3, 0xb3, 0xc2, 0xf0, 0x83, 0x6c, 0xf5, 0x4b, 0x0d, 0x52, 0xaa, 0xc7, 0x3b, 0xbc, 0x7e, 0x39,
-	0x80, 0xd6, 0x6e, 0xe5, 0x41, 0xbd, 0xd5, 0xaa, 0x6f, 0xf3, 0xeb, 0xcf, 0x9f, 0x9e, 0x15, 0x86,
-	0xc9, 0x6e, 0x90, 0xa5, 0xbe, 0x35, 0x9a, 0x25, 0xee, 0x72, 0x6c, 0xed, 0xa1, 0xbe, 0xb5, 0xab,
-	0xef, 0x70, 0x6c, 0x44, 0x62, 0x87, 0x58, 0xee, 0x2a, 0x24, 0xe5, 0x2d, 0xb8, 0x79, 0x3a, 0x3b,
-	0x77, 0x7a, 0x56, 0x08, 0x39, 0x68, 0xf5, 0x37, 0x0d, 0xe6, 0x46, 0x08, 0x8a, 0xc7, 0x6b, 0x6c,
-	0xb7, 0x9b, 0xfa, 0xa7, 0x0f, 0x6a, 0x8d, 0x9d, 0x20, 0x17, 0x9b, 0x05, 0x73, 0xcc, 0x73, 0x69,
-	0x1a, 0xdb, 0x0f, 0xea, 0xad, 0xb0, 0x62, 0x7d, 0x87, 0xf5, 0x28, 0x6f, 0x4a, 0x0e, 0x40, 0xdf,
-	0xdd, 0xf9, 0x78, 0xdb, 0xa8, 0x3f, 0x12, 0x35, 0x13, 0x58, 0xec, 0x7b, 0x07, 0xcc, 0xa1, 0x5f,
-	0x48, 0xfb, 0xbd, 0x5d, 0xdd, 0xd0, 0x1b, 0x3b, 0x35, 0x51, 0x37, 0x61, 0xef, 0xf8, 0xd8, 0xc1,
-	0xb6, 0x47, 0x88, 0x98, 0xe2, 0xa6, 0x5e, 0xe7, 0x25, 0x13, 0x03, 0xd0, 0xc7, 0xf2, 0x3f, 0x9a,
-	0xbb, 0x7a, 0x7d, 0xab, 0x56, 0x4d, 0xc7, 0x64, 0xa3, 0xf7, 0x31, 0xed, 0x12, 0x0b, 0x15, 0x21,
-	0x1d, 0x74, 0x60, 0x90, 0x6d, 0x7c, 0xb4, 0x13, 0x95, 0xd6, 0xb3, 0xd7, 0x39, 0xed, 0xf9, 0xeb,
-	0x9c, 0xf6, 0xea, 0x75, 0x4e, 0x7b, 0xfa, 0x26, 0x37, 0xf5, 0xfc, 0x4d, 0x6e, 0xea, 0x97, 0x37,
-	0xb9, 0xa9, 0x47, 0xb7, 0x86, 0xf6, 0x99, 0x1e, 0xb3, 0x7d, 0xe6, 0xdb, 0x96, 0xa8, 0x17, 0x97,
-	0xd6, 0xf6, 0xba, 0xcc, 0x3c, 0x34, 0x0f, 0x30, 0xb5, 0xcb, 0x47, 0x37, 0xca, 0xc7, 0xc1, 0xff,
-	0xd7, 0x62, 0xcd, 0xf7, 0xe2, 0x82, 0x67, 0x6e, 0xfc, 0x15, 0x00, 0x00, 0xff, 0xff, 0x28, 0x40,
-	0x39, 0x1b, 0x7a, 0x0f, 0x00, 0x00,
+	// 1938 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcb, 0x6f, 0x23, 0x49,
+	0x19, 0x8f, 0x13, 0xdb, 0x71, 0x7f, 0xce, 0xc3, 0x53, 0x13, 0x06, 0x27, 0x33, 0x38, 0x5e, 0x2f,
+	0x68, 0xa3, 0xa0, 0xb1, 0x27, 0x19, 0xad, 0xd8, 0x61, 0x59, 0x46, 0x9d, 0xd8, 0xb3, 0xf4, 0xca,
+	0x13, 0x9b, 0x76, 0x32, 0xcb, 0x2e, 0x12, 0x56, 0xa5, 0xbb, 0xec, 0x14, 0xb1, 0xbb, 0x3c, 0xfd,
+	0xc8, 0x24, 0xfc, 0x03, 0x48, 0x39, 0xed, 0x05, 0x09, 0x0e, 0xd1, 0x22, 0x4e, 0x88, 0x33, 0xff,
+	0x03, 0x7b, 0x63, 0xc5, 0x09, 0x81, 0xb4, 0x8b, 0x66, 0x2e, 0xfc, 0x09, 0x1c, 0x51, 0x3d, 0xfa,
+	0x61, 0xc7, 0x64, 0xcc, 0x22, 0x90, 0x38, 0xc5, 0xdf, 0xf7, 0xd5, 0xaf, 0xea, 0x7b, 0xfe, 0xaa,
+	0x2b, 0xb0, 0x49, 0xcf, 0x59, 0xcd, 0x1a, 0x60, 0x3a, 0xf4, 0x6a, 0x67, 0x3b, 0xc7, 0xc4, 0xc7,
+	0x3b, 0x4a, 0xac, 0x8e, 0x5c, 0xe6, 0x33, 0x84, 0xe8, 0x39, 0xab, 0x2a, 0x8d, 0x5a, 0xb0, 0xb1,
+	0xd6, 0x67, 0x7d, 0x26, 0xcc, 0x35, 0xfe, 0x4b, 0xae, 0xdc, 0xd8, 0xec, 0x33, 0xd6, 0x1f, 0x90,
+	0x9a, 0x90, 0x8e, 0x83, 0x5e, 0xcd, 0xa7, 0x43, 0xe2, 0xf9, 0x78, 0x38, 0x52, 0x0b, 0x4a, 0x16,
+	0xf3, 0x86, 0xcc, 0xab, 0x1d, 0x63, 0x8f, 0xc4, 0x87, 0x31, 0xea, 0x84, 0xf6, 0xc9, 0x0d, 0xec,
+	0xc0, 0xc5, 0x3e, 0x65, 0xa1, 0x7d, 0x5d, 0xe2, 0xbb, 0xf2, 0x64, 0x29, 0x48, 0x53, 0xe5, 0x8f,
+	0xf3, 0x90, 0x6d, 0x63, 0x17, 0x0f, 0x3d, 0x54, 0x83, 0xdb, 0x16, 0x1b, 0x0c, 0x88, 0xc5, 0x91,
+	0x5d, 0x8f, 0x3c, 0x0f, 0x88, 0x63, 0x91, 0x62, 0xaa, 0x9c, 0xda, 0x4a, 0x9b, 0x28, 0x36, 0x75,
+	0x94, 0x05, 0x6d, 0x42, 0x9e, 0x9e, 0xb3, 0x2e, 0xb6, 0x2c, 0x16, 0x38, 0x7e, 0x71, 0xbe, 0x9c,
+	0xda, 0xd2, 0x4c, 0xa0, 0xe7, 0x4c, 0x97, 0x1a, 0xd4, 0x87, 0x3b, 0x0e, 0xf1, 0x5f, 0x30, 0xf7,
+	0xb4, 0xdb, 0x23, 0xa4, 0x3b, 0x22, 0xae, 0x45, 0x1c, 0x1f, 0xf7, 0x49, 0x71, 0x81, 0xaf, 0xdd,
+	0xdb, 0xf9, 0xec, 0x8b, 0xcd, 0xb9, 0xbf, 0x7c, 0xb1, 0x79, 0x57, 0xba, 0xe4, 0xd9, 0xa7, 0x55,
+	0xca, 0x6a, 0x43, 0xec, 0x9f, 0x54, 0x9b, 0xa4, 0x8f, 0xad, 0x8b, 0x3a, 0xb1, 0xfe, 0xf4, 0xfb,
+	0xfb, 0xa0, 0x3c, 0xae, 0x13, 0xcb, 0x5c, 0x53, 0x1b, 0x3e, 0x21, 0xa4, 0x1d, 0x6d, 0x87, 0x30,
+	0xdc, 0x76, 0x98, 0x4d, 0x26, 0x4f, 0x49, 0x7f, 0xd5, 0x53, 0x6e, 0xf1, 0xdd, 0xc6, 0x8f, 0x78,
+	0x0b, 0x56, 0xa9, 0xe3, 0x13, 0xc7, 0x8f, 0x33, 0x93, 0x11, 0x99, 0x59, 0x91, 0xea, 0x30, 0x2b,
+	0x95, 0x4f, 0x33, 0x00, 0xfb, 0x51, 0xb2, 0xd0, 0x0a, 0xcc, 0x53, 0x5b, 0x24, 0x51, 0x33, 0xe7,
+	0xa9, 0x8d, 0xee, 0x40, 0x96, 0x38, 0x3e, 0xf5, 0x2f, 0x54, 0xbe, 0x94, 0x84, 0xd6, 0x20, 0x83,
+	0xed, 0x21, 0x75, 0x64, 0x6a, 0x4c, 0x29, 0xa0, 0x0d, 0xc8, 0x89, 0x3a, 0x59, 0x6c, 0x20, 0xa3,
+	0x31, 0x23, 0x19, 0x3d, 0x06, 0xf0, 0x7c, 0xec, 0xfa, 0x5d, 0x1b, 0xfb, 0xd2, 0x99, 0xfc, 0xee,
+	0x46, 0x55, 0xb6, 0x42, 0x35, 0x6c, 0x85, 0xea, 0x61, 0xd8, 0x4b, 0x7b, 0xe9, 0x4f, 0xbe, 0xdc,
+	0x4c, 0x99, 0x9a, 0xc0, 0xd4, 0xb1, 0x4f, 0xd0, 0xbb, 0x90, 0x23, 0x8e, 0x2d, 0xe1, 0xd9, 0x19,
+	0xe1, 0x8b, 0xc4, 0xb1, 0x05, 0x78, 0x0d, 0x32, 0xcf, 0x03, 0xe6, 0xe3, 0xe2, 0xa2, 0xc8, 0x82,
+	0x14, 0xb8, 0x56, 0x36, 0x43, 0x4e, 0x6a, 0x65, 0x1f, 0xdc, 0x03, 0x8d, 0x9c, 0xe1, 0x41, 0x80,
+	0x7d, 0x62, 0x17, 0x35, 0x61, 0x89, 0x15, 0x3c, 0x46, 0x3c, 0x1a, 0xb9, 0xec, 0x8c, 0xd8, 0x45,
+	0x10, 0xc6, 0x48, 0xe6, 0x36, 0x97, 0xfc, 0x94, 0x58, 0x1c, 0x98, 0x97, 0xb6, 0x50, 0xe6, 0x36,
+	0x9b, 0x7a, 0xa3, 0x80, 0xdb, 0x96, 0xa4, 0x2d, 0x94, 0xd1, 0x23, 0xc8, 0x78, 0x3e, 0x8f, 0x6b,
+	0xb9, 0x9c, 0xda, 0x5a, 0xd9, 0x7d, 0xb3, 0x7a, 0x7d, 0x18, 0xab, 0x71, 0x91, 0x3a, 0x7c, 0xa9,
+	0x29, 0x11, 0xe8, 0x1d, 0xc8, 0x8d, 0xf0, 0xc5, 0x90, 0x38, 0xbe, 0x57, 0x5c, 0x11, 0x59, 0xb9,
+	0x37, 0x0d, 0xdd, 0x56, 0x6b, 0xcc, 0x68, 0x35, 0x2f, 0xad, 0x47, 0xfb, 0x0e, 0x71, 0x8b, 0xab,
+	0xb2, 0xb4, 0x52, 0x42, 0x65, 0xc8, 0x53, 0xe7, 0x0c, 0x0f, 0xa8, 0x2d, 0x12, 0x50, 0x10, 0xbe,
+	0x26, 0x55, 0xe8, 0x5b, 0xb0, 0x42, 0x3c, 0xcb, 0x65, 0x2f, 0xa2, 0x61, 0xba, 0x25, 0x76, 0x58,
+	0x96, 0xda, 0x70, 0x9e, 0x1a, 0xb0, 0x28, 0x9b, 0xcd, 0x2b, 0x22, 0x11, 0xd7, 0xb7, 0x6f, 0x8e,
+	0xcb, 0x10, 0x8b, 0x5b, 0x23, 0xfe, 0xdb, 0x33, 0x43, 0x6c, 0xe5, 0x1f, 0x29, 0xc8, 0x85, 0xee,
+	0xa3, 0x77, 0x01, 0xbc, 0xe0, 0x78, 0x48, 0x3d, 0x8f, 0x32, 0x47, 0xf4, 0x69, 0x7e, 0xf7, 0xee,
+	0x0d, 0x01, 0x9b, 0x89, 0xe5, 0x1c, 0xac, 0xea, 0xc8, 0xc1, 0xf3, 0x33, 0x80, 0xe3, 0xe5, 0xe8,
+	0x3b, 0x61, 0xdd, 0xf1, 0x40, 0x34, 0xfd, 0x6b, 0xa0, 0xd1, 0x62, 0xf4, 0x08, 0x34, 0xd9, 0x04,
+	0xfc, 0xd0, 0xf4, 0xeb, 0x91, 0xf1, 0xea, 0xca, 0xaf, 0x16, 0x60, 0x51, 0xa9, 0x51, 0x11, 0x16,
+	0xc3, 0x6c, 0xcb, 0xf1, 0x0c, 0x45, 0x64, 0x41, 0x16, 0x0f, 0x15, 0xa7, 0x2d, 0x6c, 0xe5, 0x77,
+	0xd7, 0xab, 0x8a, 0x1b, 0x38, 0x01, 0x27, 0xf2, 0x4c, 0x9d, 0xbd, 0x07, 0x9c, 0x5c, 0x7e, 0xf7,
+	0xe5, 0xe6, 0x56, 0x9f, 0xfa, 0x27, 0xc1, 0x71, 0xd5, 0x62, 0x43, 0x45, 0xb0, 0xea, 0xcf, 0x7d,
+	0xcf, 0x3e, 0xad, 0xf9, 0x17, 0x23, 0xe2, 0x09, 0x80, 0x67, 0xaa, 0xad, 0xd1, 0x8f, 0xe1, 0x6b,
+	0x16, 0x73, 0x7c, 0x17, 0x5b, 0x7e, 0x77, 0x67, 0xe7, 0xed, 0xb7, 0xbb, 0xaa, 0x8f, 0x54, 0x2e,
+	0xde, 0x9a, 0x5e, 0x5a, 0x09, 0xe0, 0xeb, 0xc3, 0xe8, 0x6e, 0x5b, 0xd7, 0x95, 0x68, 0x0f, 0x80,
+	0x5f, 0x22, 0x2c, 0xf0, 0xbb, 0x8e, 0xa7, 0x72, 0xb4, 0x7e, 0x6d, 0xb8, 0xeb, 0xea, 0x9a, 0xd8,
+	0xcb, 0xf1, 0x28, 0x7e, 0x29, 0xe8, 0x41, 0xc1, 0x0e, 0x3c, 0xb4, 0x07, 0x4b, 0xd6, 0x8b, 0xdd,
+	0x07, 0x91, 0x5f, 0x19, 0x91, 0x8b, 0xcd, 0xa9, 0x7e, 0x7d, 0xb8, 0xfb, 0x20, 0xf4, 0x27, 0xcf,
+	0x41, 0xa1, 0x1f, 0xdb, 0x70, 0x8b, 0x7a, 0x5d, 0xe6, 0x62, 0x6b, 0x40, 0xa2, 0x8d, 0x38, 0xd7,
+	0xe4, 0xcc, 0x55, 0xea, 0xb5, 0x84, 0x5e, 0xad, 0xad, 0x9c, 0xc0, 0xed, 0x29, 0xf1, 0x89, 0x32,
+	0xd9, 0xb6, 0x4b, 0x3c, 0x2f, 0x2a, 0x93, 0x14, 0xd1, 0x3a, 0xe4, 0x7c, 0x76, 0x4a, 0x9c, 0x2e,
+	0xb5, 0x15, 0x99, 0x2e, 0x0a, 0xd9, 0x10, 0x2c, 0xab, 0x2a, 0xc8, 0xb3, 0xb9, 0x1c, 0x26, 0xfd,
+	0xbb, 0xe9, 0xbf, 0xff, 0x7a, 0x33, 0x55, 0x69, 0x40, 0x3e, 0xe1, 0xf1, 0x0d, 0x27, 0x8c, 0x6f,
+	0x93, 0x9e, 0xd8, 0xe6, 0xb7, 0x69, 0xc8, 0xec, 0xf3, 0x44, 0xa0, 0x37, 0x61, 0x39, 0x71, 0x75,
+	0x46, 0x7c, 0xbf, 0x14, 0x2b, 0x0d, 0x1b, 0xdd, 0x05, 0x0d, 0xf7, 0xf9, 0x05, 0x62, 0x47, 0xfe,
+	0xe6, 0x84, 0xa2, 0x4e, 0x6d, 0xbe, 0x83, 0x34, 0x86, 0x9e, 0xc8, 0x6b, 0x60, 0x49, 0x28, 0x75,
+	0xe5, 0x8e, 0x01, 0xab, 0xf1, 0xf0, 0x49, 0xde, 0x4e, 0xcf, 0xc8, 0xdb, 0x2b, 0x31, 0x50, 0xd0,
+	0xf7, 0x3a, 0xe4, 0x44, 0x0d, 0xb9, 0xb3, 0x19, 0x19, 0xb4, 0x90, 0x0d, 0x1b, 0x7d, 0x7f, 0x6c,
+	0xa8, 0xe5, 0xc5, 0x50, 0x9a, 0x56, 0xf5, 0x46, 0xb4, 0x6a, 0x6c, 0xae, 0x3f, 0x80, 0xd5, 0x90,
+	0x12, 0xbb, 0x9c, 0x52, 0x03, 0x4f, 0xdc, 0x11, 0xf9, 0xdd, 0x37, 0xa6, 0xb6, 0x0e, 0x17, 0x23,
+	0x32, 0x5d, 0x09, 0x91, 0x1d, 0x01, 0x44, 0xdf, 0x00, 0x08, 0x3c, 0xd2, 0x95, 0xcc, 0x25, 0x2e,
+	0x95, 0x9c, 0xa9, 0x05, 0x1e, 0x91, 0xcc, 0x96, 0x18, 0x54, 0xed, 0xbf, 0x37, 0xa8, 0x93, 0x73,
+	0x00, 0xff, 0xfe, 0x1c, 0x54, 0x7e, 0x31, 0x0f, 0xcb, 0x63, 0x91, 0x22, 0xfd, 0x1a, 0xef, 0xae,
+	0x4c, 0x4f, 0x90, 0x42, 0xc8, 0x84, 0x8c, 0xb1, 0xaf, 0x7e, 0x8d, 0x7d, 0x67, 0xdb, 0x22, 0x51,
+	0xab, 0xf7, 0x26, 0x38, 0x78, 0xa6, 0x0d, 0x62, 0x26, 0x7e, 0x3c, 0xc9, 0xc4, 0x33, 0xe1, 0x13,
+	0x7c, 0xfc, 0x69, 0x1a, 0x20, 0x6e, 0xa3, 0xb1, 0xae, 0x4c, 0x8d, 0x77, 0xe5, 0xb5, 0x11, 0x9b,
+	0x9f, 0x32, 0x62, 0x77, 0x20, 0x2b, 0xb9, 0x46, 0x8d, 0x8f, 0x92, 0xc6, 0x47, 0x2f, 0xfd, 0xba,
+	0xd1, 0xcb, 0x4c, 0x19, 0xbd, 0xef, 0x41, 0x56, 0xf5, 0x72, 0x56, 0x84, 0xf9, 0xcd, 0x9b, 0x07,
+	0x42, 0x45, 0xaa, 0x30, 0xdc, 0x2f, 0x97, 0x60, 0x8f, 0x39, 0x62, 0x12, 0x96, 0x4d, 0x25, 0xa1,
+	0xfb, 0x80, 0xce, 0x88, 0x4b, 0x7b, 0xd4, 0x12, 0x28, 0xfe, 0x81, 0xce, 0x7a, 0xa2, 0xcd, 0x35,
+	0xf3, 0x56, 0xd2, 0xd2, 0xe6, 0x06, 0x3e, 0xff, 0x71, 0xed, 0xe4, 0xfc, 0x6b, 0xb3, 0xce, 0x7f,
+	0x0c, 0x14, 0xf3, 0x1f, 0x4f, 0x0e, 0xfc, 0xef, 0x26, 0x27, 0xff, 0x15, 0x26, 0xe7, 0x39, 0x2c,
+	0xd6, 0xe5, 0x57, 0x1d, 0x27, 0x03, 0x2f, 0x38, 0xe6, 0xad, 0x13, 0xf7, 0x87, 0xa6, 0x34, 0x86,
+	0x8d, 0x10, 0xa4, 0xb9, 0x13, 0xa2, 0x31, 0x32, 0xa6, 0xf8, 0x8d, 0x1e, 0x42, 0xda, 0xc6, 0x3e,
+	0x56, 0x77, 0xea, 0xd4, 0x93, 0xd5, 0xee, 0x75, 0xec, 0x63, 0x53, 0x2c, 0xae, 0xf4, 0x21, 0x9f,
+	0x50, 0xa2, 0x02, 0x2c, 0x04, 0x2e, 0x55, 0xe7, 0xf1, 0x9f, 0x63, 0x27, 0x69, 0xea, 0xa4, 0x35,
+	0xc8, 0xc8, 0xea, 0xa9, 0xef, 0x77, 0x21, 0x88, 0x2f, 0x5f, 0xc7, 0x72, 0x2f, 0x46, 0xfc, 0xc3,
+	0x2f, 0x2d, 0xe9, 0x2b, 0x52, 0x54, 0xfe, 0x90, 0x86, 0xac, 0x62, 0xb2, 0xc9, 0x67, 0xc2, 0x7f,
+	0x7e, 0x59, 0x5c, 0x1b, 0x98, 0xf4, 0x94, 0x81, 0xb9, 0xe1, 0x1a, 0x78, 0x0c, 0x60, 0xb9, 0x84,
+	0x7f, 0x9e, 0x76, 0xb1, 0x3f, 0xf3, 0xfb, 0x40, 0x53, 0x18, 0xdd, 0x47, 0xef, 0x81, 0x46, 0xce,
+	0x47, 0xd4, 0x25, 0x1c, 0xbf, 0x38, 0x23, 0x3e, 0x27, 0x21, 0xba, 0x8f, 0xde, 0x89, 0x26, 0x2e,
+	0x27, 0x26, 0xae, 0x3c, 0xad, 0x78, 0x32, 0x7b, 0x13, 0xd3, 0xf6, 0xff, 0x72, 0x2b, 0xa0, 0x37,
+	0x60, 0xa9, 0xe7, 0xb2, 0x61, 0x54, 0xc6, 0xbc, 0xa8, 0x40, 0x9e, 0xeb, 0xc2, 0x2a, 0x26, 0x5e,
+	0x06, 0x6a, 0xd1, 0xd2, 0xd8, 0xcb, 0x40, 0x2a, 0xb7, 0x8f, 0x60, 0x75, 0xe2, 0x39, 0xc3, 0x9b,
+	0xb4, 0xd5, 0x6e, 0x1c, 0x14, 0xe6, 0x36, 0x72, 0x97, 0x57, 0xe5, 0x34, 0x1b, 0x11, 0x87, 0xf3,
+	0x50, 0x5b, 0x3f, 0xea, 0x34, 0xea, 0x85, 0xd4, 0x06, 0x5c, 0x5e, 0x95, 0xb3, 0x23, 0x1c, 0x78,
+	0x44, 0xf0, 0xe6, 0x7e, 0xb3, 0xc5, 0xf5, 0xf3, 0x52, 0x6f, 0x0d, 0x98, 0x47, 0xec, 0xed, 0x2e,
+	0x7c, 0xfd, 0x5f, 0xbc, 0x26, 0x78, 0xbf, 0xeb, 0xcd, 0x66, 0xeb, 0xc3, 0xc2, 0xdc, 0x86, 0x76,
+	0x79, 0x55, 0xce, 0xe0, 0xc1, 0x80, 0xbd, 0xe0, 0x87, 0xd6, 0x1b, 0x07, 0x1f, 0x15, 0x52, 0xf2,
+	0x50, 0x9b, 0x38, 0x17, 0xfc, 0x9d, 0x66, 0x36, 0x7e, 0x78, 0x64, 0x98, 0x62, 0xfb, 0xa5, 0xcb,
+	0xab, 0x72, 0xce, 0x25, 0xcf, 0x03, 0xea, 0x12, 0x7b, 0xfb, 0x37, 0x29, 0x28, 0x4c, 0xb2, 0x26,
+	0xff, 0x1e, 0x6b, 0x37, 0x0e, 0xea, 0xc6, 0xc1, 0xfb, 0x85, 0xb9, 0x8d, 0xfc, 0xe5, 0x55, 0x79,
+	0x71, 0x44, 0x1c, 0x9b, 0x3a, 0x7d, 0xbe, 0x95, 0xde, 0x6e, 0x9b, 0xad, 0x67, 0x22, 0x02, 0xb1,
+	0x55, 0xf2, 0xa9, 0x68, 0x36, 0x3e, 0x68, 0xec, 0x1f, 0x26, 0x8f, 0x89, 0x9f, 0x8a, 0x75, 0xa3,
+	0xd3, 0x3e, 0xe2, 0xb6, 0x05, 0x69, 0x8b, 0x9e, 0x8a, 0x65, 0xc8, 0x1b, 0x07, 0xcf, 0xf4, 0xa6,
+	0x51, 0xd7, 0xb9, 0x39, 0xbd, 0xb1, 0x7a, 0x79, 0x55, 0x4e, 0xbe, 0xce, 0xb6, 0x7f, 0x02, 0x4b,
+	0xc9, 0x3e, 0xe3, 0xd9, 0xd2, 0xf7, 0x0f, 0x8d, 0x67, 0x8d, 0xc2, 0x9c, 0xcc, 0x16, 0xb6, 0x7c,
+	0x7a, 0x46, 0xf8, 0xb0, 0x3f, 0x39, 0x6a, 0x3e, 0x31, 0x9a, 0x4d, 0xe1, 0xde, 0xf2, 0xe5, 0x55,
+	0x59, 0xeb, 0x05, 0x83, 0x1e, 0x1d, 0x0c, 0x88, 0xcd, 0xa3, 0x6a, 0xfc, 0xa8, 0xad, 0xb2, 0x20,
+	0xa2, 0x92, 0xad, 0x6e, 0x6f, 0xff, 0x3c, 0x05, 0x79, 0xd5, 0x12, 0x87, 0x9c, 0x4a, 0x4a, 0x00,
+	0x9d, 0xa3, 0xbd, 0xa7, 0x46, 0xa7, 0x63, 0xb4, 0x78, 0xfd, 0x56, 0x2e, 0xaf, 0xca, 0xc9, 0x7b,
+	0x3f, 0xca, 0x82, 0xde, 0x1c, 0xcf, 0x02, 0x1e, 0x70, 0x6c, 0xe3, 0x99, 0xde, 0x3c, 0xd2, 0x0f,
+	0x39, 0x76, 0x5e, 0x62, 0x13, 0x17, 0xfe, 0x3d, 0xd0, 0x64, 0x96, 0xb8, 0x79, 0x41, 0xfa, 0x18,
+	0x5d, 0xc7, 0xdb, 0x7f, 0x4d, 0xc1, 0xf2, 0xd8, 0x5d, 0xcd, 0xf7, 0x3b, 0x68, 0x75, 0xdb, 0xfa,
+	0x47, 0x4f, 0x1b, 0x07, 0x87, 0xa1, 0x2f, 0x0e, 0x0b, 0xdb, 0x9e, 0xfb, 0xd2, 0x36, 0x5b, 0x4f,
+	0x8d, 0x4e, 0x5c, 0x91, 0x91, 0xcb, 0x86, 0x94, 0x77, 0x55, 0x09, 0x40, 0x3f, 0x3a, 0xfc, 0x41,
+	0xcb, 0x34, 0x3e, 0x16, 0x41, 0x0b, 0x2c, 0x0e, 0xfc, 0x13, 0xe6, 0xd2, 0x9f, 0x49, 0xfb, 0xfb,
+	0x47, 0xba, 0xa9, 0x1f, 0x1c, 0x36, 0x44, 0x5d, 0x84, 0xbd, 0x1f, 0x60, 0x17, 0x3b, 0x3e, 0x21,
+	0x82, 0xd0, 0xdb, 0xba, 0xc1, 0x4b, 0x22, 0x9a, 0x69, 0x84, 0xe5, 0xbf, 0x4f, 0x9e, 0xe8, 0x06,
+	0x4f, 0x70, 0x46, 0xe6, 0xbe, 0x87, 0x29, 0xcf, 0x6e, 0x05, 0x0a, 0x61, 0x85, 0x23, 0x6f, 0xb3,
+	0xe3, 0x95, 0xde, 0xeb, 0x7c, 0xf6, 0xb2, 0x94, 0xfa, 0xfc, 0x65, 0x29, 0xf5, 0xb7, 0x97, 0xa5,
+	0xd4, 0x27, 0xaf, 0x4a, 0x73, 0x9f, 0xbf, 0x2a, 0xcd, 0xfd, 0xf9, 0x55, 0x69, 0xee, 0xe3, 0x47,
+	0x89, 0xf1, 0xa7, 0xe7, 0xac, 0xc7, 0x02, 0xc7, 0x16, 0xf9, 0xe2, 0xd2, 0xfd, 0xe3, 0x01, 0xb3,
+	0x4e, 0xad, 0x13, 0x4c, 0x9d, 0xda, 0xd9, 0xc3, 0xda, 0x79, 0xf8, 0x5f, 0x3f, 0xc1, 0x0a, 0xc7,
+	0x59, 0x41, 0x65, 0x0f, 0xff, 0x19, 0x00, 0x00, 0xff, 0xff, 0xc7, 0x4f, 0x55, 0x15, 0x10, 0x14,
+	0x00, 0x00,
 }
 
 func (this *Contract1155Payment) Equal(that interface{}) bool {
@@ -1307,6 +1620,11 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	if m.IntentSequence != 0 {
+		i = encodeVarintClaims(dAtA, i, uint64(m.IntentSequence))
+		i--
+		dAtA[i] = 0x28
+	}
 	{
 		size := m.NodeFeePercentage.Size()
 		i -= size
@@ -1362,6 +1680,22 @@ func (m *Collection) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	if m.Intents != 0 {
+		i = encodeVarintClaims(dAtA, i, uint64(m.Intents))
+		i--
+		dAtA[i] = 0x1
+		i--
+		dAtA[i] = 0x90
+	}
+	if len(m.EscrowAccount) > 0 {
+		i -= len(m.EscrowAccount)
+		copy(dAtA[i:], m.EscrowAccount)
+		i = encodeVarintClaims(dAtA, i, uint64(len(m.EscrowAccount)))
+		i--
+		dAtA[i] = 0x1
+		i--
+		dAtA[i] = 0x8a
+	}
 	if m.Invalidated != 0 {
 		i = encodeVarintClaims(dAtA, i, uint64(m.Invalidated))
 		i--
@@ -1565,6 +1899,16 @@ func (m *Payment) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	if m.IsOraclePayment {
+		i--
+		if m.IsOraclePayment {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x30
+	}
 	if len(m.Cw20Payment) > 0 {
 		for iNdEx := len(m.Cw20Payment) - 1; iNdEx >= 0; iNdEx-- {
 			{
@@ -1720,6 +2064,44 @@ func (m *Claim) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	if len(m.Cw20Payment) > 0 {
+		for iNdEx := len(m.Cw20Payment) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.Cw20Payment[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintClaims(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x52
+		}
+	}
+	if len(m.Amount) > 0 {
+		for iNdEx := len(m.Amount) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.Amount[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintClaims(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x4a
+		}
+	}
+	if m.UseIntent {
+		i--
+		if m.UseIntent {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x40
+	}
 	if m.PaymentsStatus != nil {
 		{
 			size, err := m.PaymentsStatus.MarshalToSizedBuffer(dAtA[:i])
@@ -2042,48 +2424,176 @@ func (m *DisputeData) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
-func encodeVarintClaims(dAtA []byte, offset int, v uint64) int {
-	offset -= sovClaims(v)
-	base := offset
-	for v >= 1<<7 {
-		dAtA[offset] = uint8(v&0x7f | 0x80)
-		v >>= 7
-		offset++
+func (m *Intent) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
 	}
-	dAtA[offset] = uint8(v)
-	return base
+	return dAtA[:n], nil
 }
-func (m *Params) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.CollectionSequence != 0 {
-		n += 1 + sovClaims(uint64(m.CollectionSequence))
-	}
-	l = len(m.IxoAccount)
-	if l > 0 {
-		n += 1 + l + sovClaims(uint64(l))
-	}
-	l = m.NetworkFeePercentage.Size()
-	n += 1 + l + sovClaims(uint64(l))
-	l = m.NodeFeePercentage.Size()
-	n += 1 + l + sovClaims(uint64(l))
-	return n
+
+func (m *Intent) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *Collection) Size() (n int) {
-	if m == nil {
-		return 0
-	}
+func (m *Intent) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
 	var l int
 	_ = l
-	l = len(m.Id)
-	if l > 0 {
-		n += 1 + l + sovClaims(uint64(l))
+	if len(m.EscrowAddress) > 0 {
+		i -= len(m.EscrowAddress)
+		copy(dAtA[i:], m.EscrowAddress)
+		i = encodeVarintClaims(dAtA, i, uint64(len(m.EscrowAddress)))
+		i--
+		dAtA[i] = 0x62
 	}
-	l = len(m.Entity)
+	if len(m.FromAddress) > 0 {
+		i -= len(m.FromAddress)
+		copy(dAtA[i:], m.FromAddress)
+		i = encodeVarintClaims(dAtA, i, uint64(len(m.FromAddress)))
+		i--
+		dAtA[i] = 0x5a
+	}
+	if len(m.Cw20Payment) > 0 {
+		for iNdEx := len(m.Cw20Payment) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.Cw20Payment[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintClaims(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x52
+		}
+	}
+	if len(m.Amount) > 0 {
+		for iNdEx := len(m.Amount) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.Amount[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintClaims(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x4a
+		}
+	}
+	if m.Status != 0 {
+		i = encodeVarintClaims(dAtA, i, uint64(m.Status))
+		i--
+		dAtA[i] = 0x40
+	}
+	if m.ExpireAt != nil {
+		n15, err15 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(*m.ExpireAt, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.ExpireAt):])
+		if err15 != nil {
+			return 0, err15
+		}
+		i -= n15
+		i = encodeVarintClaims(dAtA, i, uint64(n15))
+		i--
+		dAtA[i] = 0x3a
+	}
+	if m.CreatedAt != nil {
+		n16, err16 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(*m.CreatedAt, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.CreatedAt):])
+		if err16 != nil {
+			return 0, err16
+		}
+		i -= n16
+		i = encodeVarintClaims(dAtA, i, uint64(n16))
+		i--
+		dAtA[i] = 0x32
+	}
+	if len(m.ClaimId) > 0 {
+		i -= len(m.ClaimId)
+		copy(dAtA[i:], m.ClaimId)
+		i = encodeVarintClaims(dAtA, i, uint64(len(m.ClaimId)))
+		i--
+		dAtA[i] = 0x2a
+	}
+	if len(m.CollectionId) > 0 {
+		i -= len(m.CollectionId)
+		copy(dAtA[i:], m.CollectionId)
+		i = encodeVarintClaims(dAtA, i, uint64(len(m.CollectionId)))
+		i--
+		dAtA[i] = 0x22
+	}
+	if len(m.AgentAddress) > 0 {
+		i -= len(m.AgentAddress)
+		copy(dAtA[i:], m.AgentAddress)
+		i = encodeVarintClaims(dAtA, i, uint64(len(m.AgentAddress)))
+		i--
+		dAtA[i] = 0x1a
+	}
+	if len(m.AgentDid) > 0 {
+		i -= len(m.AgentDid)
+		copy(dAtA[i:], m.AgentDid)
+		i = encodeVarintClaims(dAtA, i, uint64(len(m.AgentDid)))
+		i--
+		dAtA[i] = 0x12
+	}
+	if len(m.Id) > 0 {
+		i -= len(m.Id)
+		copy(dAtA[i:], m.Id)
+		i = encodeVarintClaims(dAtA, i, uint64(len(m.Id)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func encodeVarintClaims(dAtA []byte, offset int, v uint64) int {
+	offset -= sovClaims(v)
+	base := offset
+	for v >= 1<<7 {
+		dAtA[offset] = uint8(v&0x7f | 0x80)
+		v >>= 7
+		offset++
+	}
+	dAtA[offset] = uint8(v)
+	return base
+}
+func (m *Params) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.CollectionSequence != 0 {
+		n += 1 + sovClaims(uint64(m.CollectionSequence))
+	}
+	l = len(m.IxoAccount)
+	if l > 0 {
+		n += 1 + l + sovClaims(uint64(l))
+	}
+	l = m.NetworkFeePercentage.Size()
+	n += 1 + l + sovClaims(uint64(l))
+	l = m.NodeFeePercentage.Size()
+	n += 1 + l + sovClaims(uint64(l))
+	if m.IntentSequence != 0 {
+		n += 1 + sovClaims(uint64(m.IntentSequence))
+	}
+	return n
+}
+
+func (m *Collection) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.Id)
+	if l > 0 {
+		n += 1 + l + sovClaims(uint64(l))
+	}
+	l = len(m.Entity)
 	if l > 0 {
 		n += 1 + l + sovClaims(uint64(l))
 	}
@@ -2135,6 +2645,13 @@ func (m *Collection) Size() (n int) {
 	if m.Invalidated != 0 {
 		n += 2 + sovClaims(uint64(m.Invalidated))
 	}
+	l = len(m.EscrowAccount)
+	if l > 0 {
+		n += 2 + l + sovClaims(uint64(l))
+	}
+	if m.Intents != 0 {
+		n += 2 + sovClaims(uint64(m.Intents))
+	}
 	return n
 }
 
@@ -2191,6 +2708,9 @@ func (m *Payment) Size() (n int) {
 			n += 1 + l + sovClaims(uint64(l))
 		}
 	}
+	if m.IsOraclePayment {
+		n += 2
+	}
 	return n
 }
 
@@ -2264,6 +2784,21 @@ func (m *Claim) Size() (n int) {
 		l = m.PaymentsStatus.Size()
 		n += 1 + l + sovClaims(uint64(l))
 	}
+	if m.UseIntent {
+		n += 2
+	}
+	if len(m.Amount) > 0 {
+		for _, e := range m.Amount {
+			l = e.Size()
+			n += 1 + l + sovClaims(uint64(l))
+		}
+	}
+	if len(m.Cw20Payment) > 0 {
+		for _, e := range m.Cw20Payment {
+			l = e.Size()
+			n += 1 + l + sovClaims(uint64(l))
+		}
+	}
 	return n
 }
 
@@ -2387,6 +2922,66 @@ func (m *DisputeData) Size() (n int) {
 	return n
 }
 
+func (m *Intent) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.Id)
+	if l > 0 {
+		n += 1 + l + sovClaims(uint64(l))
+	}
+	l = len(m.AgentDid)
+	if l > 0 {
+		n += 1 + l + sovClaims(uint64(l))
+	}
+	l = len(m.AgentAddress)
+	if l > 0 {
+		n += 1 + l + sovClaims(uint64(l))
+	}
+	l = len(m.CollectionId)
+	if l > 0 {
+		n += 1 + l + sovClaims(uint64(l))
+	}
+	l = len(m.ClaimId)
+	if l > 0 {
+		n += 1 + l + sovClaims(uint64(l))
+	}
+	if m.CreatedAt != nil {
+		l = github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.CreatedAt)
+		n += 1 + l + sovClaims(uint64(l))
+	}
+	if m.ExpireAt != nil {
+		l = github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.ExpireAt)
+		n += 1 + l + sovClaims(uint64(l))
+	}
+	if m.Status != 0 {
+		n += 1 + sovClaims(uint64(m.Status))
+	}
+	if len(m.Amount) > 0 {
+		for _, e := range m.Amount {
+			l = e.Size()
+			n += 1 + l + sovClaims(uint64(l))
+		}
+	}
+	if len(m.Cw20Payment) > 0 {
+		for _, e := range m.Cw20Payment {
+			l = e.Size()
+			n += 1 + l + sovClaims(uint64(l))
+		}
+	}
+	l = len(m.FromAddress)
+	if l > 0 {
+		n += 1 + l + sovClaims(uint64(l))
+	}
+	l = len(m.EscrowAddress)
+	if l > 0 {
+		n += 1 + l + sovClaims(uint64(l))
+	}
+	return n
+}
+
 func sovClaims(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
@@ -2541,6 +3136,25 @@ func (m *Params) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
+		case 5:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field IntentSequence", wireType)
+			}
+			m.IntentSequence = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowClaims
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.IntentSequence |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
 		default:
 			iNdEx = preIndex
 			skippy, err := skipClaims(dAtA[iNdEx:])
@@ -3011,6 +3625,57 @@ func (m *Collection) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
+		case 17:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field EscrowAccount", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowClaims
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthClaims
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthClaims
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.EscrowAccount = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 18:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Intents", wireType)
+			}
+			m.Intents = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowClaims
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Intents |= CollectionIntentOptions(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
 		default:
 			iNdEx = preIndex
 			skippy, err := skipClaims(dAtA[iNdEx:])
@@ -3424,7 +4089,27 @@ func (m *Payment) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		default:
+		case 6:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field IsOraclePayment", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowClaims
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.IsOraclePayment = bool(v != 0)
+		default:
 			iNdEx = preIndex
 			skippy, err := skipClaims(dAtA[iNdEx:])
 			if err != nil {
@@ -3944,6 +4629,94 @@ func (m *Claim) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
+		case 8:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field UseIntent", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowClaims
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.UseIntent = bool(v != 0)
+		case 9:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowClaims
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthClaims
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthClaims
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Amount = append(m.Amount, types.Coin{})
+			if err := m.Amount[len(m.Amount)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 10:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Cw20Payment", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowClaims
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthClaims
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthClaims
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Cw20Payment = append(m.Cw20Payment, &CW20Payment{})
+			if err := m.Cw20Payment[len(m.Cw20Payment)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipClaims(dAtA[iNdEx:])
@@ -4778,6 +5551,439 @@ func (m *DisputeData) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *Intent) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowClaims
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: Intent: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: Intent: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowClaims
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthClaims
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthClaims
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Id = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field AgentDid", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowClaims
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthClaims
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthClaims
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.AgentDid = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field AgentAddress", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowClaims
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthClaims
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthClaims
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.AgentAddress = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field CollectionId", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowClaims
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthClaims
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthClaims
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.CollectionId = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 5:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ClaimId", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowClaims
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthClaims
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthClaims
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ClaimId = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 6:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field CreatedAt", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowClaims
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthClaims
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthClaims
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.CreatedAt == nil {
+				m.CreatedAt = new(time.Time)
+			}
+			if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(m.CreatedAt, dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 7:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ExpireAt", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowClaims
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthClaims
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthClaims
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.ExpireAt == nil {
+				m.ExpireAt = new(time.Time)
+			}
+			if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(m.ExpireAt, dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 8:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType)
+			}
+			m.Status = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowClaims
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Status |= IntentStatus(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 9:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowClaims
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthClaims
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthClaims
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Amount = append(m.Amount, types.Coin{})
+			if err := m.Amount[len(m.Amount)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 10:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Cw20Payment", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowClaims
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthClaims
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthClaims
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Cw20Payment = append(m.Cw20Payment, &CW20Payment{})
+			if err := m.Cw20Payment[len(m.Cw20Payment)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 11:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field FromAddress", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowClaims
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthClaims
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthClaims
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.FromAddress = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 12:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field EscrowAddress", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowClaims
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthClaims
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthClaims
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.EscrowAddress = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipClaims(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthClaims
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func skipClaims(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0
diff --git a/x/claims/types/codec.go b/x/claims/types/codec.go
index a2fa2017..0580a787 100755
--- a/x/claims/types/codec.go
+++ b/x/claims/types/codec.go
@@ -20,6 +20,8 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
 	cdc.RegisterConcrete(&MsgUpdateCollectionState{}, "claims/UpdateCollectionState", nil)
 	cdc.RegisterConcrete(&MsgUpdateCollectionDates{}, "claims/UpdateCollectionDates", nil)
 	cdc.RegisterConcrete(&MsgUpdateCollectionPayments{}, "claims/UpdateCollectionPayments", nil)
+	cdc.RegisterConcrete(&MsgUpdateCollectionIntents{}, "claims/UpdateCollectionIntents", nil)
+	cdc.RegisterConcrete(&MsgClaimIntent{}, "claims/ClaimIntent", nil)
 }
 
 // RegisterInterfaces registers interfaces and implementations of the x/claims module.
@@ -33,6 +35,8 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 		&MsgUpdateCollectionState{},
 		&MsgUpdateCollectionDates{},
 		&MsgUpdateCollectionPayments{},
+		&MsgUpdateCollectionIntents{},
+		&MsgClaimIntent{},
 	)
 
 	registry.RegisterImplementations(
diff --git a/x/claims/types/cw20.go b/x/claims/types/cw20.go
index d7c93f77..c97c9bf6 100644
--- a/x/claims/types/cw20.go
+++ b/x/claims/types/cw20.go
@@ -6,7 +6,7 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
-func (p *CW20Payment) Validate() error {
+func (p *CW20Payment) Validate(allowZero bool) error {
 	if p == nil {
 		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "cw20 payment cannot be nil")
 	}
@@ -14,6 +14,9 @@ func (p *CW20Payment) Validate() error {
 	if err != nil {
 		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "err %s", err)
 	}
+	if !allowZero && p.Amount == 0 {
+		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "cw20 payment amount cannot be 0")
+	}
 	return nil
 }
 
@@ -21,7 +24,7 @@ func (p *CW20Payment) Validate() error {
 // - addresses are valid
 // - amounts are positive (default as type is Uint)
 // - no duplicates in addresses
-func ValidateCW20Payments(p []*CW20Payment) error {
+func ValidateCW20Payments(p []*CW20Payment, allowZero bool) error {
 	if len(p) == 0 {
 		return nil
 	}
@@ -33,10 +36,23 @@ func ValidateCW20Payments(p []*CW20Payment) error {
 			return errorsmod.Wrapf(sdkerrors.ErrInvalidRequest, "cw20 payments cannot have duplicate addresses (%s)", cw20Payment.Address)
 		}
 		addresses[cw20Payment.Address] = struct{}{}
-		if err := cw20Payment.Validate(); err != nil {
+		if err := cw20Payment.Validate(allowZero); err != nil {
 			return err
 		}
 	}
 
 	return nil
 }
+
+// IsZero returns true if there are no payments or all payments are zero.
+func IsZeroCW20Payments(cw20Payments []*CW20Payment) bool {
+	if len(cw20Payments) == 0 {
+		return true
+	}
+	for _, cw20Payment := range cw20Payments {
+		if cw20Payment.Amount != 0 {
+			return false
+		}
+	}
+	return true
+}
diff --git a/x/claims/types/errors.go b/x/claims/types/errors.go
index b25b1ed5..5e788c39 100755
--- a/x/claims/types/errors.go
+++ b/x/claims/types/errors.go
@@ -29,4 +29,9 @@ var (
 	ErrPaymentPresetPercentagesOverflow = errorsmod.Register(ModuleName, 1400, "preset fee percentages for node and network overflows 100%")
 	ErrPaymentWithdrawFailed            = errorsmod.Register(ModuleName, 1401, "payment withdrawal failed")
 	ErrDistributionFailed               = errorsmod.Register(ModuleName, 1402, "distribution calculations failed")
+	ErrOraclePaymentOnlyNative          = errorsmod.Register(ModuleName, 1403, "oracle payments can only have Native Coin payments, CW20 payments are not allowed")
+
+	ErrIntentNotFound     = errorsmod.Register(ModuleName, 1500, "intent not found")
+	ErrIntentExists       = errorsmod.Register(ModuleName, 1501, "active intent found")
+	ErrIntentUnauthorized = errorsmod.Register(ModuleName, 1502, "unauthorized")
 )
diff --git a/x/claims/types/event.pb.go b/x/claims/types/event.pb.go
index c08b626c..6a394bab 100644
--- a/x/claims/types/event.pb.go
+++ b/x/claims/types/event.pb.go
@@ -383,6 +383,96 @@ func (m *PaymentWithdrawCreatedEvent) GetWithdraw() *WithdrawPaymentConstraints
 	return nil
 }
 
+// IntentSubmittedEvent is an event triggered on an Intent submission
+type IntentSubmittedEvent struct {
+	Intent *Intent `protobuf:"bytes,1,opt,name=intent,proto3" json:"intent,omitempty"`
+}
+
+func (m *IntentSubmittedEvent) Reset()         { *m = IntentSubmittedEvent{} }
+func (m *IntentSubmittedEvent) String() string { return proto.CompactTextString(m) }
+func (*IntentSubmittedEvent) ProtoMessage()    {}
+func (*IntentSubmittedEvent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_26b125bce36ddb45, []int{8}
+}
+func (m *IntentSubmittedEvent) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *IntentSubmittedEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_IntentSubmittedEvent.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *IntentSubmittedEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IntentSubmittedEvent.Merge(m, src)
+}
+func (m *IntentSubmittedEvent) XXX_Size() int {
+	return m.Size()
+}
+func (m *IntentSubmittedEvent) XXX_DiscardUnknown() {
+	xxx_messageInfo_IntentSubmittedEvent.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_IntentSubmittedEvent proto.InternalMessageInfo
+
+func (m *IntentSubmittedEvent) GetIntent() *Intent {
+	if m != nil {
+		return m.Intent
+	}
+	return nil
+}
+
+// IntentUpdatedEvent is an event triggered on an Intent update
+type IntentUpdatedEvent struct {
+	Intent *Intent `protobuf:"bytes,1,opt,name=intent,proto3" json:"intent,omitempty"`
+}
+
+func (m *IntentUpdatedEvent) Reset()         { *m = IntentUpdatedEvent{} }
+func (m *IntentUpdatedEvent) String() string { return proto.CompactTextString(m) }
+func (*IntentUpdatedEvent) ProtoMessage()    {}
+func (*IntentUpdatedEvent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_26b125bce36ddb45, []int{9}
+}
+func (m *IntentUpdatedEvent) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *IntentUpdatedEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_IntentUpdatedEvent.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *IntentUpdatedEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IntentUpdatedEvent.Merge(m, src)
+}
+func (m *IntentUpdatedEvent) XXX_Size() int {
+	return m.Size()
+}
+func (m *IntentUpdatedEvent) XXX_DiscardUnknown() {
+	xxx_messageInfo_IntentUpdatedEvent.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_IntentUpdatedEvent proto.InternalMessageInfo
+
+func (m *IntentUpdatedEvent) GetIntent() *Intent {
+	if m != nil {
+		return m.Intent
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*CollectionCreatedEvent)(nil), "ixo.claims.v1beta1.CollectionCreatedEvent")
 	proto.RegisterType((*CollectionUpdatedEvent)(nil), "ixo.claims.v1beta1.CollectionUpdatedEvent")
@@ -392,36 +482,40 @@ func init() {
 	proto.RegisterType((*ClaimDisputedEvent)(nil), "ixo.claims.v1beta1.ClaimDisputedEvent")
 	proto.RegisterType((*PaymentWithdrawnEvent)(nil), "ixo.claims.v1beta1.PaymentWithdrawnEvent")
 	proto.RegisterType((*PaymentWithdrawCreatedEvent)(nil), "ixo.claims.v1beta1.PaymentWithdrawCreatedEvent")
+	proto.RegisterType((*IntentSubmittedEvent)(nil), "ixo.claims.v1beta1.IntentSubmittedEvent")
+	proto.RegisterType((*IntentUpdatedEvent)(nil), "ixo.claims.v1beta1.IntentUpdatedEvent")
 }
 
 func init() { proto.RegisterFile("ixo/claims/v1beta1/event.proto", fileDescriptor_26b125bce36ddb45) }
 
 var fileDescriptor_26b125bce36ddb45 = []byte{
-	// 379 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xbf, 0x4e, 0xf3, 0x30,
-	0x14, 0xc5, 0x9b, 0xe1, 0xfb, 0x40, 0x66, 0x22, 0xfc, 0x11, 0xb4, 0x92, 0x41, 0x99, 0x58, 0x88,
-	0x55, 0x2a, 0x06, 0x16, 0x06, 0xd2, 0x32, 0xc0, 0x82, 0x52, 0x55, 0x20, 0x36, 0x27, 0x31, 0x8d,
-	0x45, 0x62, 0x47, 0x89, 0x93, 0xa6, 0x3c, 0x05, 0x8f, 0xc5, 0xd8, 0x91, 0x11, 0xb5, 0x2f, 0x82,
-	0x12, 0xbb, 0xa1, 0x81, 0x48, 0x08, 0xa9, 0x5b, 0xee, 0x3d, 0xe7, 0xfc, 0xee, 0x75, 0x64, 0x03,
-	0x48, 0x73, 0x8e, 0xdc, 0x00, 0xd3, 0x30, 0x41, 0x59, 0xd7, 0x21, 0x02, 0x77, 0x11, 0xc9, 0x08,
-	0x13, 0x66, 0x14, 0x73, 0xc1, 0x75, 0x9d, 0xe6, 0xdc, 0x94, 0xba, 0xa9, 0xf4, 0xf6, 0xee, 0x98,
-	0x8f, 0x79, 0x29, 0xa3, 0xe2, 0x4b, 0x3a, 0xdb, 0x47, 0x0d, 0x24, 0x15, 0x94, 0x86, 0xa6, 0x51,
-	0x38, 0x15, 0xfe, 0x8b, 0xd4, 0x8d, 0x07, 0xb0, 0x6f, 0xf1, 0x20, 0x20, 0xae, 0xa0, 0x9c, 0x59,
-	0x31, 0xc1, 0x82, 0x78, 0x83, 0x62, 0x15, 0xfd, 0x12, 0x00, 0xb7, 0x52, 0x0e, 0xb4, 0x63, 0xed,
-	0x64, 0xeb, 0x0c, 0x9a, 0x3f, 0x37, 0x33, 0xbf, 0xf2, 0xf6, 0x4a, 0xa2, 0x4e, 0x1e, 0x45, 0xde,
-	0xfa, 0xc8, 0xd7, 0x60, 0xc7, 0x2a, 0x8c, 0xc3, 0xd4, 0x09, 0xa9, 0xa8, 0xb0, 0x08, 0xfc, 0x2b,
-	0xf3, 0x8a, 0x78, 0xd8, 0x48, 0x2c, 0x4a, 0x5b, 0xfa, 0x8c, 0x3e, 0xd8, 0x2e, 0xeb, 0xda, 0x72,
-	0x7f, 0xa6, 0x8c, 0xd4, 0x36, 0x83, 0x0c, 0x07, 0x69, 0xed, 0x90, 0x44, 0x76, 0x7e, 0x39, 0xe4,
-	0xa0, 0x72, 0xd9, 0x2b, 0x09, 0xe3, 0x16, 0xe8, 0x25, 0xb6, 0x4f, 0x93, 0x28, 0xad, 0xa8, 0xe7,
-	0x60, 0xc3, 0x93, 0x0d, 0x85, 0xec, 0x34, 0x21, 0x55, 0xc6, 0x5e, 0x7a, 0x0d, 0x17, 0xec, 0xdd,
-	0xe1, 0x69, 0x48, 0x98, 0xb8, 0xa7, 0xc2, 0xf7, 0x62, 0x3c, 0x61, 0x92, 0x77, 0x03, 0x36, 0x27,
-	0xaa, 0xa3, 0x80, 0x66, 0x13, 0x70, 0x99, 0x52, 0x10, 0x8b, 0xb3, 0x44, 0xc4, 0x98, 0x32, 0x91,
-	0xd8, 0x55, 0xde, 0xa0, 0xa0, 0xf3, 0x6d, 0x48, 0xed, 0x3e, 0xad, 0x71, 0xd4, 0xd5, 0xf0, 0x6d,
-	0x0e, 0xb5, 0xd9, 0x1c, 0x6a, 0x1f, 0x73, 0xa8, 0xbd, 0x2e, 0x60, 0x6b, 0xb6, 0x80, 0xad, 0xf7,
-	0x05, 0x6c, 0x3d, 0x5e, 0x8c, 0xa9, 0xf0, 0x53, 0xc7, 0x74, 0x79, 0x88, 0x68, 0xce, 0x9f, 0x78,
-	0xca, 0xbc, 0xf2, 0x87, 0x16, 0xd5, 0xa9, 0x13, 0x70, 0xf7, 0xd9, 0xf5, 0x31, 0x65, 0x28, 0xeb,
-	0xa1, 0x7c, 0xf9, 0x30, 0xc4, 0x34, 0x22, 0x89, 0xf3, 0xbf, 0x7c, 0x11, 0xbd, 0xcf, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0x2d, 0x18, 0x80, 0x87, 0x9e, 0x03, 0x00, 0x00,
+	// 415 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x41, 0x6f, 0x9b, 0x30,
+	0x14, 0xc7, 0xc3, 0x61, 0xd9, 0xe4, 0x9d, 0xc6, 0xb2, 0x69, 0x4b, 0x24, 0x6f, 0xe2, 0xb4, 0xcb,
+	0xb0, 0x92, 0x68, 0x87, 0x5d, 0x76, 0x18, 0x49, 0xd5, 0xa6, 0x97, 0x8a, 0x28, 0x6a, 0xd5, 0x9b,
+	0x01, 0x37, 0x58, 0x05, 0x1b, 0x81, 0x21, 0xa4, 0x9f, 0xa2, 0x1f, 0xab, 0xc7, 0x1c, 0x7b, 0xac,
+	0x92, 0x2f, 0x52, 0x81, 0x1d, 0x1a, 0x52, 0xa4, 0xaa, 0x55, 0x6e, 0xf8, 0xbd, 0xff, 0xff, 0xf7,
+	0x7f, 0x16, 0xcf, 0x00, 0xd2, 0x9c, 0x23, 0x37, 0xc0, 0x34, 0x4c, 0x50, 0xd6, 0x77, 0x88, 0xc0,
+	0x7d, 0x44, 0x32, 0xc2, 0x84, 0x19, 0xc5, 0x5c, 0x70, 0x5d, 0xa7, 0x39, 0x37, 0x65, 0xdf, 0x54,
+	0xfd, 0x6e, 0x67, 0xce, 0xe7, 0xbc, 0x6c, 0xa3, 0xe2, 0x4b, 0x2a, 0xbb, 0x3f, 0x1a, 0x48, 0xca,
+	0x28, 0x05, 0x4d, 0x51, 0x38, 0x15, 0xfe, 0x8d, 0xec, 0x1b, 0x17, 0xe0, 0xab, 0xc5, 0x83, 0x80,
+	0xb8, 0x82, 0x72, 0x66, 0xc5, 0x04, 0x0b, 0xe2, 0x8d, 0x8b, 0x51, 0xf4, 0x7f, 0x00, 0xb8, 0x55,
+	0xe7, 0x9b, 0xf6, 0x53, 0xfb, 0xf5, 0x71, 0x00, 0xcd, 0xe7, 0x93, 0x99, 0x4f, 0x7e, 0x7b, 0xc7,
+	0x51, 0x27, 0xcf, 0x22, 0xef, 0x70, 0xe4, 0x23, 0xf0, 0xd9, 0x2a, 0x84, 0xd3, 0xd4, 0x09, 0xa9,
+	0xa8, 0xb0, 0x08, 0xbc, 0x2b, 0xfd, 0x8a, 0xf8, 0xbd, 0x91, 0x58, 0x1c, 0x6d, 0xa9, 0x33, 0x46,
+	0xe0, 0x53, 0x79, 0xae, 0x0d, 0xf7, 0x6a, 0xca, 0x4c, 0x4d, 0x33, 0xce, 0x70, 0x90, 0xd6, 0x2e,
+	0x49, 0x64, 0xe5, 0x85, 0x4b, 0x8e, 0x2b, 0x95, 0xbd, 0xe3, 0x30, 0x4e, 0x81, 0x5e, 0x62, 0x47,
+	0x34, 0x89, 0xd2, 0x8a, 0xfa, 0x07, 0xbc, 0xf7, 0x64, 0x41, 0x21, 0x7b, 0x4d, 0x48, 0xe5, 0xb1,
+	0xb7, 0x5a, 0xc3, 0x05, 0x5f, 0xce, 0xf0, 0x32, 0x24, 0x4c, 0x9c, 0x53, 0xe1, 0x7b, 0x31, 0x5e,
+	0x30, 0xc9, 0x9b, 0x80, 0x0f, 0x0b, 0x55, 0x51, 0x40, 0xb3, 0x09, 0xb8, 0x75, 0x29, 0x88, 0xc5,
+	0x59, 0x22, 0x62, 0x4c, 0x99, 0x48, 0xec, 0xca, 0x6f, 0x50, 0xd0, 0xdb, 0x0b, 0xa9, 0xed, 0xd3,
+	0x21, 0xa3, 0x26, 0xa0, 0x73, 0xc2, 0x04, 0x61, 0x62, 0x6f, 0x05, 0x06, 0xa0, 0x4d, 0xcb, 0xba,
+	0x4a, 0xe8, 0x36, 0x25, 0x48, 0xa7, 0xad, 0x94, 0xc6, 0x31, 0xd0, 0x65, 0xa5, 0xb6, 0x06, 0x6f,
+	0x20, 0xfd, 0x9f, 0xde, 0xad, 0xa1, 0xb6, 0x5a, 0x43, 0xed, 0x61, 0x0d, 0xb5, 0xdb, 0x0d, 0x6c,
+	0xad, 0x36, 0xb0, 0x75, 0xbf, 0x81, 0xad, 0xcb, 0xbf, 0x73, 0x2a, 0xfc, 0xd4, 0x31, 0x5d, 0x1e,
+	0x22, 0x9a, 0xf3, 0x2b, 0x9e, 0x32, 0xaf, 0xfc, 0xcd, 0xc5, 0xe9, 0xb7, 0x13, 0x70, 0xf7, 0xda,
+	0xf5, 0x31, 0x65, 0x28, 0x1b, 0xa2, 0x7c, 0xfb, 0x5c, 0xc5, 0x32, 0x22, 0x89, 0xd3, 0x2e, 0xdf,
+	0xe9, 0xf0, 0x31, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x6d, 0x8d, 0xc3, 0x34, 0x04, 0x00, 0x00,
 }
 
 func (m *CollectionCreatedEvent) Marshal() (dAtA []byte, err error) {
@@ -704,6 +798,76 @@ func (m *PaymentWithdrawCreatedEvent) MarshalToSizedBuffer(dAtA []byte) (int, er
 	return len(dAtA) - i, nil
 }
 
+func (m *IntentSubmittedEvent) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *IntentSubmittedEvent) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *IntentSubmittedEvent) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.Intent != nil {
+		{
+			size, err := m.Intent.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintEvent(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *IntentUpdatedEvent) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *IntentUpdatedEvent) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *IntentUpdatedEvent) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.Intent != nil {
+		{
+			size, err := m.Intent.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintEvent(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
 func encodeVarintEvent(dAtA []byte, offset int, v uint64) int {
 	offset -= sovEvent(v)
 	base := offset
@@ -819,6 +983,32 @@ func (m *PaymentWithdrawCreatedEvent) Size() (n int) {
 	return n
 }
 
+func (m *IntentSubmittedEvent) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.Intent != nil {
+		l = m.Intent.Size()
+		n += 1 + l + sovEvent(uint64(l))
+	}
+	return n
+}
+
+func (m *IntentUpdatedEvent) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.Intent != nil {
+		l = m.Intent.Size()
+		n += 1 + l + sovEvent(uint64(l))
+	}
+	return n
+}
+
 func sovEvent(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
@@ -1513,6 +1703,178 @@ func (m *PaymentWithdrawCreatedEvent) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *IntentSubmittedEvent) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowEvent
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: IntentSubmittedEvent: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: IntentSubmittedEvent: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Intent", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvent
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthEvent
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvent
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Intent == nil {
+				m.Intent = &Intent{}
+			}
+			if err := m.Intent.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipEvent(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthEvent
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *IntentUpdatedEvent) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowEvent
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: IntentUpdatedEvent: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: IntentUpdatedEvent: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Intent", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvent
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthEvent
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvent
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Intent == nil {
+				m.Intent = &Intent{}
+			}
+			if err := m.Intent.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipEvent(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthEvent
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func skipEvent(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0
diff --git a/x/claims/types/expected_keepers.go b/x/claims/types/expected_keepers.go
index 3ce04540..2999029b 100644
--- a/x/claims/types/expected_keepers.go
+++ b/x/claims/types/expected_keepers.go
@@ -30,8 +30,15 @@ type AuthzKeeper interface {
 type BankKeeper interface {
 	HasBalance(ctx context.Context, addr sdk.AccAddress, amt sdk.Coin) bool
 	InputOutputCoins(ctx context.Context, input banktypes.Input, outputs []banktypes.Output) error
+	SendCoins(ctx context.Context, fromAddr, toAddr sdk.AccAddress, amt sdk.Coins) error
 }
 
 type WasmKeeper interface {
 	Execute(ctx sdk.Context, contractAddress sdk.AccAddress, caller sdk.AccAddress, msg []byte, coins sdk.Coins) ([]byte, error)
 }
+
+type AccountKeeper interface {
+	NewAccountWithAddress(context.Context, sdk.AccAddress) sdk.AccountI
+	GetAccount(context.Context, sdk.AccAddress) sdk.AccountI
+	SetAccount(context.Context, sdk.AccountI)
+}
diff --git a/x/claims/types/genesis.pb.go b/x/claims/types/genesis.pb.go
index 3795d069..18b6b22b 100644
--- a/x/claims/types/genesis.pb.go
+++ b/x/claims/types/genesis.pb.go
@@ -29,6 +29,7 @@ type GenesisState struct {
 	Collections []Collection `protobuf:"bytes,2,rep,name=collections,proto3" json:"collections"`
 	Claims      []Claim      `protobuf:"bytes,3,rep,name=claims,proto3" json:"claims"`
 	Disputes    []Dispute    `protobuf:"bytes,4,rep,name=disputes,proto3" json:"disputes"`
+	Intents     []Intent     `protobuf:"bytes,5,rep,name=intents,proto3" json:"intents"`
 }
 
 func (m *GenesisState) Reset()         { *m = GenesisState{} }
@@ -92,6 +93,13 @@ func (m *GenesisState) GetDisputes() []Dispute {
 	return nil
 }
 
+func (m *GenesisState) GetIntents() []Intent {
+	if m != nil {
+		return m.Intents
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*GenesisState)(nil), "ixo.claims.v1beta1.GenesisState")
 }
@@ -99,26 +107,27 @@ func init() {
 func init() { proto.RegisterFile("ixo/claims/v1beta1/genesis.proto", fileDescriptor_43a260806dd06159) }
 
 var fileDescriptor_43a260806dd06159 = []byte{
-	// 296 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4e, 0xeb, 0x30,
-	0x14, 0x86, 0x93, 0xb6, 0xaa, 0xae, 0xdc, 0x3b, 0x59, 0x0c, 0xa1, 0x48, 0x6e, 0xc5, 0xd4, 0x05,
-	0x5b, 0x6d, 0x07, 0x60, 0x60, 0x29, 0x08, 0x56, 0x44, 0x37, 0x36, 0xc7, 0x35, 0xa9, 0x45, 0x92,
-	0x13, 0xd5, 0x4e, 0x15, 0xde, 0x80, 0x91, 0xc7, 0xea, 0xd8, 0x91, 0x09, 0xa1, 0xe4, 0x45, 0x50,
-	0xec, 0xb4, 0x42, 0x22, 0x9b, 0x8f, 0xce, 0xf7, 0xfd, 0x3e, 0xfa, 0xd1, 0x58, 0x15, 0xc0, 0x44,
-	0xcc, 0x55, 0xa2, 0xd9, 0x76, 0x1a, 0x4a, 0xc3, 0xa7, 0x2c, 0x92, 0xa9, 0xd4, 0x4a, 0xd3, 0x6c,
-	0x03, 0x06, 0x30, 0x56, 0x05, 0x50, 0x47, 0xd0, 0x86, 0x18, 0x9e, 0x44, 0x10, 0x81, 0x5d, 0xb3,
-	0xfa, 0xe5, 0xc8, 0xe1, 0xa8, 0x25, 0xab, 0x11, 0x2d, 0x70, 0xfe, 0xde, 0x41, 0xff, 0x1f, 0x5c,
-	0xf8, 0xd2, 0x70, 0x23, 0xf1, 0x15, 0xea, 0x67, 0x7c, 0xc3, 0x13, 0x1d, 0xf8, 0x63, 0x7f, 0x32,
-	0x98, 0x0d, 0xe9, 0xdf, 0xcf, 0xe8, 0xa3, 0x25, 0x16, 0xbd, 0xdd, 0xd7, 0xc8, 0x7b, 0x6a, 0x78,
-	0x7c, 0x8f, 0x06, 0x02, 0xe2, 0x58, 0x0a, 0xa3, 0x20, 0xd5, 0x41, 0x67, 0xdc, 0x9d, 0x0c, 0x66,
-	0xa4, 0x4d, 0xbf, 0x3d, 0x62, 0x4d, 0xc4, 0x6f, 0x11, 0x5f, 0xa2, 0xbe, 0xe3, 0x83, 0xae, 0x8d,
-	0x38, 0x6d, 0x8d, 0xa8, 0xc7, 0xc3, 0x01, 0x6e, 0x87, 0x6f, 0xd0, 0xbf, 0x95, 0xd2, 0x59, 0x6e,
-	0xa4, 0x0e, 0x7a, 0x56, 0x3d, 0x6b, 0x53, 0xef, 0x1c, 0xd3, 0xc8, 0x47, 0x65, 0xb1, 0xdc, 0x95,
-	0xc4, 0xdf, 0x97, 0xc4, 0xff, 0x2e, 0x89, 0xff, 0x51, 0x11, 0x6f, 0x5f, 0x11, 0xef, 0xb3, 0x22,
-	0xde, 0xf3, 0x75, 0xa4, 0xcc, 0x3a, 0x0f, 0xa9, 0x80, 0x84, 0xa9, 0x02, 0x5e, 0x20, 0x4f, 0x57,
-	0xbc, 0x3e, 0xb6, 0x9e, 0x2e, 0xc2, 0x18, 0xc4, 0xab, 0x58, 0x73, 0x95, 0xb2, 0xed, 0x9c, 0x15,
-	0x87, 0xba, 0xcd, 0x5b, 0x26, 0x75, 0xd8, 0xb7, 0x35, 0xcf, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff,
-	0x5b, 0x6d, 0x9c, 0xd4, 0xd5, 0x01, 0x00, 0x00,
+	// 317 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0x4f, 0x4f, 0x32, 0x31,
+	0x10, 0x87, 0x77, 0x81, 0x97, 0xd7, 0x14, 0x4f, 0x8d, 0x87, 0x15, 0x93, 0x42, 0x3c, 0x71, 0x71,
+	0x1b, 0xe0, 0xe0, 0x9f, 0xc4, 0x0b, 0x1a, 0x8d, 0x37, 0x23, 0x37, 0x6f, 0xdd, 0x52, 0x97, 0xc6,
+	0xa5, 0xb3, 0xa1, 0x85, 0xac, 0xdf, 0xc2, 0x0f, 0xe5, 0x81, 0x23, 0x47, 0x4f, 0xc6, 0xc0, 0x17,
+	0x31, 0xdb, 0x16, 0x62, 0xe2, 0xde, 0x3a, 0x99, 0xe7, 0xf9, 0x75, 0x26, 0x83, 0xba, 0xb2, 0x00,
+	0xca, 0x33, 0x26, 0x67, 0x9a, 0x2e, 0xfb, 0x89, 0x30, 0xac, 0x4f, 0x53, 0xa1, 0x84, 0x96, 0x3a,
+	0xce, 0xe7, 0x60, 0x00, 0x63, 0x59, 0x40, 0xec, 0x88, 0xd8, 0x13, 0xed, 0xa3, 0x14, 0x52, 0xb0,
+	0x6d, 0x5a, 0xbe, 0x1c, 0xd9, 0xee, 0x54, 0x64, 0x79, 0xd1, 0x02, 0xa7, 0x1f, 0x35, 0x74, 0x78,
+	0xef, 0xc2, 0xc7, 0x86, 0x19, 0x81, 0x2f, 0x50, 0x33, 0x67, 0x73, 0x36, 0xd3, 0x51, 0xd8, 0x0d,
+	0x7b, 0xad, 0x41, 0x3b, 0xfe, 0xfb, 0x59, 0xfc, 0x68, 0x89, 0x51, 0x63, 0xf5, 0xd5, 0x09, 0x9e,
+	0x3c, 0x8f, 0xef, 0x50, 0x8b, 0x43, 0x96, 0x09, 0x6e, 0x24, 0x28, 0x1d, 0xd5, 0xba, 0xf5, 0x5e,
+	0x6b, 0x40, 0xaa, 0xf4, 0x9b, 0x3d, 0xe6, 0x23, 0x7e, 0x8b, 0xf8, 0x1c, 0x35, 0x1d, 0x1f, 0xd5,
+	0x6d, 0xc4, 0x71, 0x65, 0x44, 0x59, 0xee, 0x06, 0x70, 0x3d, 0x7c, 0x8d, 0x0e, 0x26, 0x52, 0xe7,
+	0x0b, 0x23, 0x74, 0xd4, 0xb0, 0xea, 0x49, 0x95, 0x7a, 0xeb, 0x18, 0x2f, 0xef, 0x15, 0x7c, 0x85,
+	0xfe, 0x4b, 0x65, 0x84, 0x32, 0x3a, 0xfa, 0x67, 0xed, 0xca, 0xd5, 0x1f, 0x2c, 0xe2, 0xe5, 0x9d,
+	0x30, 0x1a, 0xaf, 0x36, 0x24, 0x5c, 0x6f, 0x48, 0xf8, 0xbd, 0x21, 0xe1, 0xfb, 0x96, 0x04, 0xeb,
+	0x2d, 0x09, 0x3e, 0xb7, 0x24, 0x78, 0xbe, 0x4c, 0xa5, 0x99, 0x2e, 0x92, 0x98, 0xc3, 0x8c, 0xca,
+	0x02, 0x5e, 0x60, 0xa1, 0x26, 0xac, 0x5c, 0xb4, 0xac, 0xce, 0x92, 0x0c, 0xf8, 0x2b, 0x9f, 0x32,
+	0xa9, 0xe8, 0x72, 0x48, 0x8b, 0xdd, 0xa9, 0xcc, 0x5b, 0x2e, 0x74, 0xd2, 0xb4, 0x27, 0x1a, 0xfe,
+	0x04, 0x00, 0x00, 0xff, 0xff, 0x37, 0x3a, 0x81, 0xa5, 0x11, 0x02, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
@@ -141,6 +150,20 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	if len(m.Intents) > 0 {
+		for iNdEx := len(m.Intents) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.Intents[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintGenesis(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x2a
+		}
+	}
 	if len(m.Disputes) > 0 {
 		for iNdEx := len(m.Disputes) - 1; iNdEx >= 0; iNdEx-- {
 			{
@@ -233,6 +256,12 @@ func (m *GenesisState) Size() (n int) {
 			n += 1 + l + sovGenesis(uint64(l))
 		}
 	}
+	if len(m.Intents) > 0 {
+		for _, e := range m.Intents {
+			l = e.Size()
+			n += 1 + l + sovGenesis(uint64(l))
+		}
+	}
 	return n
 }
 
@@ -406,6 +435,40 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
+		case 5:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Intents", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowGenesis
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthGenesis
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthGenesis
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Intents = append(m.Intents, Intent{})
+			if err := m.Intents[len(m.Intents)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipGenesis(dAtA[iNdEx:])
diff --git a/x/claims/types/keys.go b/x/claims/types/keys.go
index 4e779c3a..32164331 100755
--- a/x/claims/types/keys.go
+++ b/x/claims/types/keys.go
@@ -1,5 +1,10 @@
 package types
 
+import (
+	fmt "fmt"
+	"strings"
+)
+
 const (
 	// ModuleName defines the module name
 	ModuleName = "claims"
@@ -19,4 +24,23 @@ var (
 	CollectionKey = []byte{0x01}
 	ClaimKey      = []byte{0x02}
 	DisputeKey    = []byte{0x03}
+	IntentKey     = []byte{0x04}
 )
+
+// Create the key for Intents KV Store: agentAddress+"/"+collectionID+"/"+intentID
+func IntentKeyCreate(agentAddress, collectionId, intentID string) []byte {
+	return []byte(agentAddress + "/" + collectionId + "/" + intentID)
+}
+
+// Unused for now
+// ParseActiveIntentKey parses the ActiveIntentKey into agentAddress and collectionId
+func ParseActiveIntentKey(key []byte) (agentAddress string, collectionId string, err error) {
+	// Convert byte array to string and split by "/"
+	parts := strings.Split(string(key), "/")
+	if len(parts) != 2 {
+		return "", "", fmt.Errorf("invalid active intent key: %s", string(key))
+	}
+	agentAddress = parts[0]
+	collectionId = parts[1]
+	return agentAddress, collectionId, nil
+}
diff --git a/x/claims/types/msg_validation.go b/x/claims/types/msg_validation.go
index 2c00b280..7e70558a 100755
--- a/x/claims/types/msg_validation.go
+++ b/x/claims/types/msg_validation.go
@@ -32,6 +32,9 @@ func (msg MsgCreateCollection) ValidateBasic() error {
 	if !ixo.IsEnumValueValid(CollectionState_name, int32(msg.State)) {
 		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "invalid enum for state")
 	}
+	if !ixo.IsEnumValueValid(CollectionIntentOptions_name, int32(msg.Intents)) {
+		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "invalid enum for intents")
+	}
 
 	return nil
 }
@@ -60,6 +63,13 @@ func (msg MsgSubmitClaim) ValidateBasic() error {
 		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "collection_id cannot be empty")
 	}
 
+	if err = ValidateCoinsAllowZero(msg.Amount.Sort()); err != nil {
+		return err
+	}
+	if err = ValidateCW20Payments(msg.Cw20Payment, true); err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -101,11 +111,10 @@ func (msg MsgEvaluateClaim) ValidateBasic() error {
 		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "invalid enum for status")
 	}
 
-	if err = msg.Amount.Sort().Validate(); err != nil {
+	if err = ValidateCoinsAllowZero(msg.Amount.Sort()); err != nil {
 		return err
 	}
-
-	if err = ValidateCW20Payments(msg.Cw20Payment); err != nil {
+	if err = ValidateCW20Payments(msg.Cw20Payment, true); err != nil {
 		return err
 	}
 
@@ -161,7 +170,7 @@ func (msg MsgWithdrawPayment) ValidateBasic() error {
 		return err
 	}
 
-	if err = ValidateCW20Payments(msg.Cw20Payment); err != nil {
+	if err = ValidateCW20Payments(msg.Cw20Payment, true); err != nil {
 		return err
 	}
 
@@ -227,3 +236,46 @@ func (msg MsgUpdateCollectionPayments) ValidateBasic() error {
 
 	return nil
 }
+
+// --------------------------
+// UPDATE COLLECTION INTENTS
+// --------------------------
+func (msg MsgUpdateCollectionIntents) ValidateBasic() error {
+	_, err := sdk.AccAddressFromBech32(msg.AdminAddress)
+	if err != nil {
+		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid admin address (%s)", err)
+	}
+	if iidtypes.IsEmpty(msg.CollectionId) {
+		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "collection_id cannot be empty")
+	}
+	if !ixo.IsEnumValueValid(CollectionIntentOptions_name, int32(msg.Intents)) {
+		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "invalid enum for intents")
+	}
+
+	return nil
+}
+
+// --------------------------
+// CLAIM INTENT
+// --------------------------
+func (msg *MsgClaimIntent) ValidateBasic() error {
+	_, err := sdk.AccAddressFromBech32(msg.AgentAddress)
+	if err != nil {
+		return errorsmod.Wrapf(err, "invalid agent address (%s)", err)
+	}
+	if !iidtypes.IsValidDID(msg.AgentDid.Did()) {
+		return errorsmod.Wrap(iidtypes.ErrInvalidDIDFormat, msg.AgentDid.String())
+	}
+	if iidtypes.IsEmpty(msg.CollectionId) {
+		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "collection_id cannot be empty")
+	}
+
+	if err = ValidateCoinsAllowZero(msg.Amount.Sort()); err != nil {
+		return err
+	}
+	if err = ValidateCW20Payments(msg.Cw20Payment, true); err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/x/claims/types/params.go b/x/claims/types/params.go
index 32fec103..309de3c3 100755
--- a/x/claims/types/params.go
+++ b/x/claims/types/params.go
@@ -10,6 +10,7 @@ import (
 
 var (
 	KeyCollectionSequence   = []byte("CollectionSequence")
+	KeyIntentSequence       = []byte("IntentSequence")
 	KeyIxoAccount           = []byte("IxoAccount")
 	KeyNetworkFeePercentage = []byte("NetworkFeePercentage")
 	KeyNodeFeePercentage    = []byte("NodeFeePercentage")
@@ -23,10 +24,11 @@ func ParamKeyTable() paramtypes.KeyTable {
 }
 
 // NewParams creates a new Params instance
-func NewParams(collectionSequence uint64, ixoAccount string,
+func NewParams(collectionSequence, intentSequence uint64, ixoAccount string,
 	networkFeePercentage, nodeFeePercentage math.LegacyDec) Params {
 	return Params{
 		CollectionSequence:   collectionSequence,
+		IntentSequence:       intentSequence,
 		IxoAccount:           ixoAccount,
 		NetworkFeePercentage: networkFeePercentage,
 		NodeFeePercentage:    nodeFeePercentage,
@@ -38,13 +40,14 @@ func DefaultParams() Params {
 	defaultIxoAccount := "ixo1kqmtxkggcqa9u34lnr6shy0euvclgatw4f9zz5"
 	tenPercentFee := math.LegacyNewDec(10)
 
-	return NewParams(1, defaultIxoAccount, tenPercentFee, tenPercentFee)
+	return NewParams(1, 1, defaultIxoAccount, tenPercentFee, tenPercentFee)
 }
 
 // ParamSetPairs get the params.ParamSet
 func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs {
 	return paramtypes.ParamSetPairs{
 		paramtypes.ParamSetPair{Key: KeyCollectionSequence, Value: &p.CollectionSequence, ValidatorFn: validateCollectionSequence},
+		paramtypes.ParamSetPair{Key: KeyIntentSequence, Value: &p.IntentSequence, ValidatorFn: validateCollectionSequence},
 		paramtypes.ParamSetPair{Key: KeyIxoAccount, Value: &p.IxoAccount, ValidatorFn: validateIxoAccount},
 		paramtypes.ParamSetPair{Key: KeyNetworkFeePercentage, Value: &p.NetworkFeePercentage, ValidatorFn: validateFeePercentage},
 		paramtypes.ParamSetPair{Key: KeyNodeFeePercentage, Value: &p.NodeFeePercentage, ValidatorFn: validateFeePercentage},
@@ -95,6 +98,10 @@ func (p Params) Validate() error {
 	if err != nil {
 		return err
 	}
+	err = validateCollectionSequence(p.IntentSequence)
+	if err != nil {
+		return err
+	}
 	err = validateIxoAccount(p.IxoAccount)
 	if err != nil {
 		return err
diff --git a/x/claims/types/query.pb.go b/x/claims/types/query.pb.go
index 2378f11a..92da96da 100644
--- a/x/claims/types/query.pb.go
+++ b/x/claims/types/query.pb.go
@@ -663,6 +663,206 @@ func (m *QueryDisputeListResponse) GetPagination() *query.PageResponse {
 	return nil
 }
 
+type QueryIntentRequest struct {
+	Id           string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	AgentAddress string `protobuf:"bytes,2,opt,name=agentAddress,proto3" json:"agentAddress,omitempty"`
+	CollectionId string `protobuf:"bytes,3,opt,name=collectionId,proto3" json:"collectionId,omitempty"`
+}
+
+func (m *QueryIntentRequest) Reset()         { *m = QueryIntentRequest{} }
+func (m *QueryIntentRequest) String() string { return proto.CompactTextString(m) }
+func (*QueryIntentRequest) ProtoMessage()    {}
+func (*QueryIntentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_496f233aff18959b, []int{14}
+}
+func (m *QueryIntentRequest) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *QueryIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_QueryIntentRequest.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *QueryIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryIntentRequest.Merge(m, src)
+}
+func (m *QueryIntentRequest) XXX_Size() int {
+	return m.Size()
+}
+func (m *QueryIntentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryIntentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryIntentRequest proto.InternalMessageInfo
+
+func (m *QueryIntentRequest) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
+}
+
+func (m *QueryIntentRequest) GetAgentAddress() string {
+	if m != nil {
+		return m.AgentAddress
+	}
+	return ""
+}
+
+func (m *QueryIntentRequest) GetCollectionId() string {
+	if m != nil {
+		return m.CollectionId
+	}
+	return ""
+}
+
+type QueryIntentResponse struct {
+	Intent Intent `protobuf:"bytes,1,opt,name=intent,proto3" json:"intent"`
+}
+
+func (m *QueryIntentResponse) Reset()         { *m = QueryIntentResponse{} }
+func (m *QueryIntentResponse) String() string { return proto.CompactTextString(m) }
+func (*QueryIntentResponse) ProtoMessage()    {}
+func (*QueryIntentResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_496f233aff18959b, []int{15}
+}
+func (m *QueryIntentResponse) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *QueryIntentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_QueryIntentResponse.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *QueryIntentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryIntentResponse.Merge(m, src)
+}
+func (m *QueryIntentResponse) XXX_Size() int {
+	return m.Size()
+}
+func (m *QueryIntentResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryIntentResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryIntentResponse proto.InternalMessageInfo
+
+func (m *QueryIntentResponse) GetIntent() Intent {
+	if m != nil {
+		return m.Intent
+	}
+	return Intent{}
+}
+
+type QueryIntentListRequest struct {
+	Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"`
+}
+
+func (m *QueryIntentListRequest) Reset()         { *m = QueryIntentListRequest{} }
+func (m *QueryIntentListRequest) String() string { return proto.CompactTextString(m) }
+func (*QueryIntentListRequest) ProtoMessage()    {}
+func (*QueryIntentListRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_496f233aff18959b, []int{16}
+}
+func (m *QueryIntentListRequest) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *QueryIntentListRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_QueryIntentListRequest.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *QueryIntentListRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryIntentListRequest.Merge(m, src)
+}
+func (m *QueryIntentListRequest) XXX_Size() int {
+	return m.Size()
+}
+func (m *QueryIntentListRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryIntentListRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryIntentListRequest proto.InternalMessageInfo
+
+func (m *QueryIntentListRequest) GetPagination() *query.PageRequest {
+	if m != nil {
+		return m.Pagination
+	}
+	return nil
+}
+
+type QueryIntentListResponse struct {
+	Intents    []Intent            `protobuf:"bytes,1,rep,name=intents,proto3" json:"intents"`
+	Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"`
+}
+
+func (m *QueryIntentListResponse) Reset()         { *m = QueryIntentListResponse{} }
+func (m *QueryIntentListResponse) String() string { return proto.CompactTextString(m) }
+func (*QueryIntentListResponse) ProtoMessage()    {}
+func (*QueryIntentListResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_496f233aff18959b, []int{17}
+}
+func (m *QueryIntentListResponse) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *QueryIntentListResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_QueryIntentListResponse.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *QueryIntentListResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryIntentListResponse.Merge(m, src)
+}
+func (m *QueryIntentListResponse) XXX_Size() int {
+	return m.Size()
+}
+func (m *QueryIntentListResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryIntentListResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryIntentListResponse proto.InternalMessageInfo
+
+func (m *QueryIntentListResponse) GetIntents() []Intent {
+	if m != nil {
+		return m.Intents
+	}
+	return nil
+}
+
+func (m *QueryIntentListResponse) GetPagination() *query.PageResponse {
+	if m != nil {
+		return m.Pagination
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*QueryParamsRequest)(nil), "ixo.claims.v1beta1.QueryParamsRequest")
 	proto.RegisterType((*QueryParamsResponse)(nil), "ixo.claims.v1beta1.QueryParamsResponse")
@@ -678,59 +878,72 @@ func init() {
 	proto.RegisterType((*QueryDisputeResponse)(nil), "ixo.claims.v1beta1.QueryDisputeResponse")
 	proto.RegisterType((*QueryDisputeListRequest)(nil), "ixo.claims.v1beta1.QueryDisputeListRequest")
 	proto.RegisterType((*QueryDisputeListResponse)(nil), "ixo.claims.v1beta1.QueryDisputeListResponse")
+	proto.RegisterType((*QueryIntentRequest)(nil), "ixo.claims.v1beta1.QueryIntentRequest")
+	proto.RegisterType((*QueryIntentResponse)(nil), "ixo.claims.v1beta1.QueryIntentResponse")
+	proto.RegisterType((*QueryIntentListRequest)(nil), "ixo.claims.v1beta1.QueryIntentListRequest")
+	proto.RegisterType((*QueryIntentListResponse)(nil), "ixo.claims.v1beta1.QueryIntentListResponse")
 }
 
 func init() { proto.RegisterFile("ixo/claims/v1beta1/query.proto", fileDescriptor_496f233aff18959b) }
 
 var fileDescriptor_496f233aff18959b = []byte{
-	// 742 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x96, 0x41, 0x4f, 0xd4, 0x5a,
-	0x14, 0xc7, 0xa7, 0xf3, 0xde, 0x0c, 0x8f, 0x03, 0xe1, 0x85, 0x63, 0x05, 0x2c, 0xa4, 0x98, 0x1a,
-	0x01, 0x41, 0xdb, 0x00, 0x31, 0x6a, 0x8c, 0x1b, 0x24, 0xb8, 0xd0, 0x44, 0x1d, 0x76, 0x6e, 0x48,
-	0xa7, 0x53, 0xca, 0x8d, 0x33, 0xbd, 0x65, 0xda, 0x21, 0x20, 0xc1, 0x85, 0xee, 0x5c, 0x99, 0xb8,
-	0x73, 0xe9, 0x07, 0xf0, 0x73, 0xb0, 0x24, 0x71, 0xe3, 0xca, 0x18, 0xf0, 0x33, 0xb8, 0x36, 0xbd,
-	0xf7, 0xcc, 0xb4, 0xc3, 0x74, 0x9c, 0x2e, 0x60, 0x37, 0xbd, 0xf7, 0x7f, 0xce, 0xff, 0x77, 0xce,
-	0xbd, 0xf7, 0x64, 0x40, 0x67, 0xfb, 0xdc, 0x72, 0xea, 0x36, 0x6b, 0x84, 0xd6, 0xde, 0x72, 0xd5,
-	0x8d, 0xec, 0x65, 0x6b, 0xb7, 0xe5, 0x36, 0x0f, 0xcc, 0xa0, 0xc9, 0x23, 0x8e, 0xc8, 0xf6, 0xb9,
-	0x29, 0xf7, 0x4d, 0xda, 0xd7, 0x54, 0x8f, 0x7b, 0x5c, 0x6c, 0x5b, 0xf1, 0x2f, 0xa9, 0xd4, 0x66,
-	0x3c, 0xce, 0xbd, 0xba, 0x6b, 0xd9, 0x01, 0xb3, 0x6c, 0xdf, 0xe7, 0x91, 0x1d, 0x31, 0xee, 0x87,
-	0xb4, 0xbb, 0xe8, 0xf0, 0xb0, 0xc1, 0x43, 0xab, 0x6a, 0x87, 0xae, 0x34, 0xe8, 0xd8, 0x05, 0xb6,
-	0xc7, 0x7c, 0x21, 0x26, 0xed, 0x6c, 0x06, 0x13, 0x21, 0x08, 0x81, 0xa1, 0x02, 0xbe, 0x8c, 0x53,
-	0xbc, 0xb0, 0x9b, 0x76, 0x23, 0xac, 0xb8, 0xbb, 0x2d, 0x37, 0x8c, 0x8c, 0xe7, 0x70, 0xa5, 0x6b,
-	0x35, 0x0c, 0xb8, 0x1f, 0xba, 0x78, 0x1f, 0xca, 0x81, 0x58, 0x99, 0x52, 0xae, 0x2b, 0x0b, 0x23,
-	0x2b, 0x9a, 0xd9, 0x5b, 0x92, 0x29, 0x63, 0xd6, 0xfe, 0x3d, 0xfe, 0x31, 0x5b, 0xa8, 0x90, 0xde,
-	0x58, 0x80, 0x09, 0x91, 0xf0, 0x31, 0xaf, 0xd7, 0x5d, 0x27, 0x06, 0x24, 0x2b, 0x1c, 0x83, 0x22,
-	0xab, 0x89, 0x7c, 0xc3, 0x95, 0x22, 0xab, 0x19, 0x5b, 0x30, 0xd9, 0xa3, 0x24, 0xfb, 0x75, 0x00,
-	0xa7, 0xb3, 0x4a, 0x08, 0x7a, 0x16, 0x42, 0x12, 0x4b, 0x18, 0xa9, 0x38, 0xa3, 0x06, 0xda, 0x39,
-	0x83, 0x67, 0x2c, 0x8c, 0xda, 0x38, 0x1b, 0x00, 0x49, 0x13, 0xc9, 0x63, 0xce, 0x94, 0x1d, 0x37,
-	0xe3, 0x8e, 0x9b, 0xf2, 0x48, 0x93, 0x6a, 0x3d, 0x97, 0x62, 0x2b, 0xa9, 0x48, 0xe3, 0xab, 0x02,
-	0xd3, 0x99, 0x36, 0x54, 0xcb, 0x06, 0x8c, 0x24, 0x4c, 0x71, 0x3f, 0xff, 0xc9, 0x5d, 0x4c, 0x3a,
-	0x10, 0x9f, 0x74, 0xf1, 0x16, 0x05, 0xef, 0xfc, 0x40, 0x5e, 0x09, 0xd1, 0x05, 0x7c, 0x03, 0xc6,
-	0x25, 0x6f, 0xec, 0xde, 0xef, 0x70, 0x9e, 0xd2, 0x6d, 0x21, 0x11, 0xd5, 0x72, 0x17, 0x4a, 0x82,
-	0x99, 0xda, 0x75, 0x2d, 0xb3, 0x8a, 0xf8, 0x93, 0x0a, 0x90, 0x6a, 0x63, 0x0b, 0xae, 0x26, 0xc9,
-	0x2e, 0xe3, 0x0c, 0x3e, 0x2b, 0xed, 0x5b, 0x97, 0x38, 0x10, 0xf2, 0x3d, 0x28, 0x4b, 0x40, 0xea,
-	0xfc, 0x40, 0x66, 0x92, 0x5f, 0x5c, 0xbf, 0x97, 0xe8, 0x89, 0xad, 0xb3, 0x30, 0x68, 0x45, 0x6d,
-	0x7e, 0x54, 0xa1, 0x14, 0x34, 0x39, 0xdf, 0xa6, 0xa6, 0xcb, 0x0f, 0x63, 0x13, 0xd4, 0x6e, 0x31,
-	0x95, 0xf1, 0x10, 0x86, 0x6a, 0x72, 0x89, 0xda, 0x34, 0x9d, 0x55, 0x07, 0x45, 0x51, 0x25, 0xed,
-	0x08, 0xc3, 0xa6, 0x97, 0x46, 0xdb, 0x97, 0x71, 0x02, 0x5f, 0x14, 0x98, 0xea, 0xf5, 0x20, 0xf8,
-	0x47, 0xf0, 0x1f, 0xa1, 0xb4, 0x4f, 0x21, 0x07, 0x7d, 0x27, 0xe4, 0xc2, 0x4e, 0x62, 0xe5, 0x77,
-	0x19, 0x4a, 0x02, 0x12, 0x5b, 0x50, 0x96, 0xd3, 0x0b, 0xe7, 0xb2, 0x48, 0x7a, 0x07, 0xa5, 0x36,
-	0x3f, 0x50, 0x27, 0x0d, 0x0d, 0xed, 0xdd, 0xb7, 0x5f, 0x9f, 0x8a, 0x2a, 0xa2, 0x95, 0x9a, 0xc8,
-	0x72, 0x38, 0xe2, 0x7b, 0x05, 0x20, 0x79, 0xe5, 0xb8, 0xd8, 0x37, 0x67, 0xcf, 0xf4, 0xd4, 0x96,
-	0x72, 0x69, 0x89, 0x61, 0x46, 0x30, 0x4c, 0xa0, 0x2a, 0x19, 0x3a, 0x02, 0xeb, 0x90, 0xd5, 0x8e,
-	0xf0, 0x83, 0x02, 0x63, 0xdd, 0xc3, 0x0a, 0xcd, 0x1c, 0xd9, 0x53, 0xd7, 0x46, 0xb3, 0x72, 0xeb,
-	0x89, 0x68, 0x52, 0x10, 0x8d, 0xe3, 0xff, 0xe7, 0x88, 0x90, 0x43, 0x49, 0xbc, 0x3e, 0xbc, 0xd9,
-	0x3f, 0x65, 0x6a, 0x50, 0x69, 0x73, 0x83, 0x64, 0xd9, 0x86, 0xf1, 0x9e, 0xac, 0x7e, 0x0f, 0x86,
-	0x3b, 0x53, 0x02, 0x6f, 0xfd, 0x3d, 0x5b, 0xba, 0xe4, 0xc5, 0x3c, 0x52, 0x32, 0x47, 0x61, 0x3e,
-	0x8a, 0x90, 0x98, 0xe3, 0x1b, 0x18, 0xa2, 0x0b, 0x8e, 0xfd, 0xef, 0x52, 0xf7, 0x8c, 0xd0, 0x16,
-	0x06, 0x0b, 0x33, 0x4f, 0x9c, 0x9e, 0x8e, 0x75, 0x28, 0x86, 0xca, 0x11, 0xbe, 0x85, 0x91, 0xd4,
-	0xbb, 0xc4, 0xa5, 0x41, 0x69, 0xd3, 0x75, 0xdf, 0xce, 0x27, 0x26, 0x0e, 0x55, 0x70, 0x8c, 0xe1,
-	0x68, 0x9a, 0x63, 0x6d, 0xf3, 0xf8, 0x54, 0x57, 0x4e, 0x4e, 0x75, 0xe5, 0xe7, 0xa9, 0xae, 0x7c,
-	0x3c, 0xd3, 0x0b, 0x27, 0x67, 0x7a, 0xe1, 0xfb, 0x99, 0x5e, 0x78, 0xf5, 0xc0, 0x63, 0xd1, 0x4e,
-	0xab, 0x6a, 0x3a, 0xbc, 0x11, 0x47, 0x6c, 0xf3, 0x96, 0x5f, 0x13, 0x8f, 0x35, 0xfe, 0xba, 0x53,
-	0xad, 0x73, 0xe7, 0xb5, 0xb3, 0x63, 0x33, 0xdf, 0xda, 0x5b, 0xb5, 0xf6, 0xdb, 0xaf, 0x29, 0x3a,
-	0x08, 0xdc, 0xb0, 0x5a, 0x16, 0xff, 0x6b, 0x56, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x2a, 0x23,
-	0xb4, 0xa4, 0x8e, 0x09, 0x00, 0x00,
+	// 895 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4d, 0x4f, 0xd4, 0x5a,
+	0x18, 0x9e, 0x0e, 0x77, 0x86, 0x3b, 0xef, 0x70, 0xb9, 0xe1, 0x30, 0x02, 0x16, 0x52, 0x4c, 0x8d,
+	0x80, 0xa0, 0xad, 0x40, 0xfc, 0x8e, 0x0b, 0x91, 0x60, 0x88, 0x26, 0xea, 0xb0, 0x73, 0x83, 0x9d,
+	0x69, 0x29, 0x8d, 0x33, 0x3d, 0x65, 0xda, 0x21, 0xc0, 0x64, 0x5c, 0x68, 0xe2, 0xc2, 0x95, 0xc6,
+	0x9d, 0x0b, 0x17, 0xfe, 0x00, 0x7f, 0x07, 0x4b, 0x12, 0x37, 0xae, 0x8c, 0x01, 0x7f, 0x88, 0xe9,
+	0x39, 0x6f, 0xa7, 0x2d, 0xd3, 0xf9, 0x58, 0xc0, 0x6e, 0x7a, 0xce, 0xf3, 0x9e, 0xe7, 0x79, 0x3f,
+	0xce, 0x73, 0x06, 0x24, 0x6b, 0x8f, 0xaa, 0xe5, 0x8a, 0x66, 0x55, 0x5d, 0x75, 0x77, 0xb1, 0x64,
+	0x78, 0xda, 0xa2, 0xba, 0x53, 0x37, 0x6a, 0xfb, 0x8a, 0x53, 0xa3, 0x1e, 0x25, 0xc4, 0xda, 0xa3,
+	0x0a, 0xdf, 0x57, 0x70, 0x5f, 0x2c, 0x98, 0xd4, 0xa4, 0x6c, 0x5b, 0xf5, 0x7f, 0x71, 0xa4, 0x38,
+	0x65, 0x52, 0x6a, 0x56, 0x0c, 0x55, 0x73, 0x2c, 0x55, 0xb3, 0x6d, 0xea, 0x69, 0x9e, 0x45, 0x6d,
+	0x17, 0x77, 0xe7, 0xcb, 0xd4, 0xad, 0x52, 0x57, 0x2d, 0x69, 0xae, 0xc1, 0x09, 0x5a, 0x74, 0x8e,
+	0x66, 0x5a, 0x36, 0x03, 0x23, 0x76, 0x3a, 0x41, 0x13, 0x4a, 0x60, 0x00, 0xb9, 0x00, 0xe4, 0x85,
+	0x7f, 0xc4, 0x73, 0xad, 0xa6, 0x55, 0xdd, 0xa2, 0xb1, 0x53, 0x37, 0x5c, 0x4f, 0x7e, 0x06, 0xa3,
+	0xb1, 0x55, 0xd7, 0xa1, 0xb6, 0x6b, 0x90, 0x3b, 0x90, 0x75, 0xd8, 0xca, 0x84, 0x70, 0x49, 0x98,
+	0xcb, 0x2f, 0x89, 0x4a, 0x7b, 0x4a, 0x0a, 0x8f, 0x59, 0xf9, 0xe7, 0xf0, 0xd7, 0x74, 0xaa, 0x88,
+	0x78, 0x79, 0x0e, 0xc6, 0xd8, 0x81, 0x8f, 0x68, 0xa5, 0x62, 0x94, 0x7d, 0x81, 0x48, 0x45, 0x86,
+	0x21, 0x6d, 0xe9, 0xec, 0xbc, 0x5c, 0x31, 0x6d, 0xe9, 0xf2, 0x26, 0x8c, 0xb7, 0x21, 0x91, 0x7e,
+	0x15, 0xa0, 0xdc, 0x5a, 0x45, 0x09, 0x52, 0x92, 0x84, 0x30, 0x16, 0x65, 0x44, 0xe2, 0x64, 0x1d,
+	0xc4, 0x53, 0x04, 0x4f, 0x2d, 0xd7, 0x0b, 0xe4, 0xac, 0x01, 0x84, 0x45, 0x44, 0x8e, 0x19, 0x85,
+	0x57, 0x5c, 0xf1, 0x2b, 0xae, 0xf0, 0x96, 0x86, 0xd9, 0x9a, 0x06, 0xc6, 0x16, 0x23, 0x91, 0xf2,
+	0x77, 0x01, 0x26, 0x13, 0x69, 0x30, 0x97, 0x35, 0xc8, 0x87, 0x9a, 0xfc, 0x7a, 0x0e, 0xf4, 0x9d,
+	0x4c, 0x34, 0x90, 0x3c, 0x8e, 0xe9, 0x4d, 0x33, 0xbd, 0xb3, 0x3d, 0xf5, 0x72, 0x11, 0x31, 0xc1,
+	0x97, 0x61, 0x84, 0xeb, 0xf5, 0xd9, 0x3b, 0x35, 0xe7, 0x09, 0x4e, 0x0b, 0x82, 0x30, 0x97, 0x9b,
+	0x90, 0x61, 0x9a, 0xb1, 0x5c, 0x17, 0x13, 0xb3, 0xf0, 0x3f, 0x31, 0x01, 0x8e, 0x96, 0x37, 0xe1,
+	0x42, 0x78, 0xd8, 0x79, 0xf4, 0xe0, 0x8b, 0x10, 0x4c, 0x5d, 0xc8, 0x80, 0x92, 0x6f, 0x43, 0x96,
+	0x0b, 0xc4, 0xca, 0xf7, 0xd4, 0x8c, 0xf0, 0xb3, 0xab, 0xf7, 0x02, 0x5e, 0xb1, 0x55, 0xcb, 0x75,
+	0xea, 0x5e, 0xa0, 0x9f, 0x14, 0x20, 0xe3, 0xd4, 0x28, 0xdd, 0xc2, 0xa2, 0xf3, 0x0f, 0x79, 0x03,
+	0x0a, 0x71, 0x30, 0xa6, 0x71, 0x1f, 0x06, 0x75, 0xbe, 0x84, 0x65, 0x9a, 0x4c, 0xca, 0x03, 0xa3,
+	0x30, 0x93, 0x20, 0x42, 0xd6, 0xf0, 0xa6, 0xe1, 0xf6, 0x79, 0x74, 0xe0, 0x9b, 0x00, 0x13, 0xed,
+	0x1c, 0x28, 0xfe, 0x01, 0xfc, 0x8b, 0x52, 0x82, 0x2e, 0xf4, 0xa1, 0xbe, 0x15, 0x72, 0x76, 0x9d,
+	0xa8, 0xe0, 0x50, 0xaf, 0xdb, 0x9e, 0x61, 0x7b, 0x1d, 0x46, 0x9f, 0xc8, 0x30, 0xa4, 0x99, 0x86,
+	0xed, 0x3d, 0xd4, 0xf5, 0x9a, 0xe1, 0xba, 0x8c, 0x30, 0x57, 0x8c, 0xad, 0xf9, 0x98, 0xf0, 0x6e,
+	0xae, 0xeb, 0x13, 0x03, 0x1c, 0x13, 0x5d, 0x6b, 0x59, 0x6b, 0xc0, 0x16, 0x5a, 0xab, 0xc5, 0x56,
+	0xba, 0x59, 0x2b, 0x8f, 0x09, 0x26, 0x92, 0xe3, 0xe5, 0x57, 0x38, 0xe4, 0x7c, 0xf3, 0x3c, 0xba,
+	0xf8, 0x55, 0xc0, 0x49, 0x89, 0x52, 0xa0, 0xee, 0x7b, 0x30, 0xc8, 0x75, 0x04, 0x3d, 0xec, 0x2d,
+	0x3c, 0x08, 0x38, 0xb3, 0x0e, 0x2e, 0xbd, 0xcf, 0x41, 0x86, 0x09, 0x24, 0x75, 0xc8, 0xf2, 0xf7,
+	0x87, 0xcc, 0x24, 0xe9, 0x68, 0x7f, 0xea, 0xc4, 0xd9, 0x9e, 0x38, 0x4e, 0x28, 0x8b, 0x6f, 0x7f,
+	0xfc, 0xf9, 0x9c, 0x2e, 0x10, 0xa2, 0x46, 0xde, 0x54, 0xfe, 0xbc, 0x91, 0x77, 0x02, 0x40, 0xe8,
+	0xd3, 0x64, 0xbe, 0xe3, 0x99, 0x6d, 0xef, 0x9f, 0xb8, 0xd0, 0x17, 0x16, 0x35, 0x4c, 0x31, 0x0d,
+	0x63, 0xa4, 0xc0, 0x35, 0xb4, 0x00, 0x6a, 0xc3, 0xd2, 0x9b, 0xe4, 0x83, 0x00, 0xc3, 0xf1, 0xe7,
+	0x86, 0x28, 0x7d, 0x9c, 0x1e, 0x19, 0x19, 0x51, 0xed, 0x1b, 0x8f, 0x8a, 0xc6, 0x99, 0xa2, 0x11,
+	0xf2, 0xff, 0x29, 0x45, 0x84, 0x42, 0x86, 0xf9, 0x27, 0xb9, 0xd2, 0xf9, 0xc8, 0xc8, 0x53, 0x23,
+	0xce, 0xf4, 0x82, 0x25, 0x13, 0xfa, 0x7b, 0x3c, 0xfb, 0x5d, 0xc8, 0xb5, 0x7c, 0x9e, 0x5c, 0xed,
+	0x7e, 0x5a, 0x34, 0xe5, 0xf9, 0x7e, 0xa0, 0x48, 0x4e, 0x18, 0xf9, 0x10, 0x81, 0x90, 0x9c, 0x1c,
+	0xc0, 0x20, 0x5a, 0x14, 0xe9, 0x3c, 0x4b, 0x71, 0x97, 0x17, 0xe7, 0x7a, 0x03, 0x13, 0x3b, 0x8e,
+	0xe6, 0xa7, 0x36, 0xd8, 0xb3, 0xd0, 0x24, 0x6f, 0x20, 0x1f, 0x71, 0x56, 0xb2, 0xd0, 0xeb, 0xd8,
+	0x68, 0xde, 0xd7, 0xfa, 0x03, 0xa3, 0x8e, 0x02, 0xd3, 0x31, 0x4c, 0x86, 0xa2, 0x3a, 0xc8, 0x27,
+	0x01, 0xb2, 0xfc, 0x6e, 0x77, 0xb9, 0x6f, 0x31, 0x5f, 0xed, 0x72, 0xdf, 0xe2, 0x8e, 0x28, 0xdf,
+	0x62, 0x8c, 0x37, 0x88, 0xc2, 0x18, 0xb9, 0x67, 0xa8, 0x8d, 0xa8, 0xdf, 0x36, 0xd5, 0x46, 0xd4,
+	0x5a, 0x9b, 0x7c, 0x0e, 0x0e, 0x00, 0x42, 0x9f, 0xea, 0x72, 0x15, 0xdb, 0xfc, 0xb2, 0xcb, 0x55,
+	0x6c, 0x37, 0x3e, 0x79, 0x94, 0xc9, 0xfb, 0x8f, 0xe4, 0x23, 0xf2, 0x56, 0x36, 0x0e, 0x8f, 0x25,
+	0xe1, 0xe8, 0x58, 0x12, 0x7e, 0x1f, 0x4b, 0xc2, 0xc7, 0x13, 0x29, 0x75, 0x74, 0x22, 0xa5, 0x7e,
+	0x9e, 0x48, 0xa9, 0x97, 0x77, 0x4d, 0xcb, 0xdb, 0xae, 0x97, 0x94, 0x32, 0xad, 0xfa, 0x01, 0x5b,
+	0xb4, 0x6e, 0xeb, 0xcc, 0xbc, 0xfc, 0xaf, 0xeb, 0xa5, 0x0a, 0x2d, 0xbf, 0x2e, 0x6f, 0x6b, 0x96,
+	0xad, 0xee, 0x2e, 0xab, 0x7b, 0x81, 0xbb, 0x78, 0xfb, 0x8e, 0xe1, 0x96, 0xb2, 0xec, 0x9f, 0xfa,
+	0xf2, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc1, 0x2e, 0xd5, 0x39, 0x60, 0x0c, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -753,6 +966,8 @@ type QueryClient interface {
 	ClaimList(ctx context.Context, in *QueryClaimListRequest, opts ...grpc.CallOption) (*QueryClaimListResponse, error)
 	Dispute(ctx context.Context, in *QueryDisputeRequest, opts ...grpc.CallOption) (*QueryDisputeResponse, error)
 	DisputeList(ctx context.Context, in *QueryDisputeListRequest, opts ...grpc.CallOption) (*QueryDisputeListResponse, error)
+	Intent(ctx context.Context, in *QueryIntentRequest, opts ...grpc.CallOption) (*QueryIntentResponse, error)
+	IntentList(ctx context.Context, in *QueryIntentListRequest, opts ...grpc.CallOption) (*QueryIntentListResponse, error)
 }
 
 type queryClient struct {
@@ -826,6 +1041,24 @@ func (c *queryClient) DisputeList(ctx context.Context, in *QueryDisputeListReque
 	return out, nil
 }
 
+func (c *queryClient) Intent(ctx context.Context, in *QueryIntentRequest, opts ...grpc.CallOption) (*QueryIntentResponse, error) {
+	out := new(QueryIntentResponse)
+	err := c.cc.Invoke(ctx, "/ixo.claims.v1beta1.Query/Intent", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *queryClient) IntentList(ctx context.Context, in *QueryIntentListRequest, opts ...grpc.CallOption) (*QueryIntentListResponse, error) {
+	out := new(QueryIntentListResponse)
+	err := c.cc.Invoke(ctx, "/ixo.claims.v1beta1.Query/IntentList", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // QueryServer is the server API for Query service.
 type QueryServer interface {
 	// Parameters queries the parameters of the module.
@@ -836,6 +1069,8 @@ type QueryServer interface {
 	ClaimList(context.Context, *QueryClaimListRequest) (*QueryClaimListResponse, error)
 	Dispute(context.Context, *QueryDisputeRequest) (*QueryDisputeResponse, error)
 	DisputeList(context.Context, *QueryDisputeListRequest) (*QueryDisputeListResponse, error)
+	Intent(context.Context, *QueryIntentRequest) (*QueryIntentResponse, error)
+	IntentList(context.Context, *QueryIntentListRequest) (*QueryIntentListResponse, error)
 }
 
 // UnimplementedQueryServer can be embedded to have forward compatible implementations.
@@ -863,6 +1098,12 @@ func (*UnimplementedQueryServer) Dispute(ctx context.Context, req *QueryDisputeR
 func (*UnimplementedQueryServer) DisputeList(ctx context.Context, req *QueryDisputeListRequest) (*QueryDisputeListResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DisputeList not implemented")
 }
+func (*UnimplementedQueryServer) Intent(ctx context.Context, req *QueryIntentRequest) (*QueryIntentResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Intent not implemented")
+}
+func (*UnimplementedQueryServer) IntentList(ctx context.Context, req *QueryIntentListRequest) (*QueryIntentListResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method IntentList not implemented")
+}
 
 func RegisterQueryServer(s grpc1.Server, srv QueryServer) {
 	s.RegisterService(&_Query_serviceDesc, srv)
@@ -994,6 +1235,42 @@ func _Query_DisputeList_Handler(srv interface{}, ctx context.Context, dec func(i
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Query_Intent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(QueryIntentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(QueryServer).Intent(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/ixo.claims.v1beta1.Query/Intent",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(QueryServer).Intent(ctx, req.(*QueryIntentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Query_IntentList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(QueryIntentListRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(QueryServer).IntentList(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/ixo.claims.v1beta1.Query/IntentList",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(QueryServer).IntentList(ctx, req.(*QueryIntentListRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _Query_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "ixo.claims.v1beta1.Query",
 	HandlerType: (*QueryServer)(nil),
@@ -1026,6 +1303,14 @@ var _Query_serviceDesc = grpc.ServiceDesc{
 			MethodName: "DisputeList",
 			Handler:    _Query_DisputeList_Handler,
 		},
+		{
+			MethodName: "Intent",
+			Handler:    _Query_Intent_Handler,
+		},
+		{
+			MethodName: "IntentList",
+			Handler:    _Query_IntentList_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "ixo/claims/v1beta1/query.proto",
@@ -1528,78 +1813,239 @@ func (m *QueryDisputeListResponse) MarshalToSizedBuffer(dAtA []byte) (int, error
 	return len(dAtA) - i, nil
 }
 
-func encodeVarintQuery(dAtA []byte, offset int, v uint64) int {
-	offset -= sovQuery(v)
-	base := offset
-	for v >= 1<<7 {
-		dAtA[offset] = uint8(v&0x7f | 0x80)
-		v >>= 7
-		offset++
-	}
-	dAtA[offset] = uint8(v)
-	return base
-}
-func (m *QueryParamsRequest) Size() (n int) {
-	if m == nil {
-		return 0
+func (m *QueryIntentRequest) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
 	}
-	var l int
-	_ = l
-	return n
+	return dAtA[:n], nil
 }
 
-func (m *QueryParamsResponse) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	l = m.Params.Size()
-	n += 1 + l + sovQuery(uint64(l))
-	return n
+func (m *QueryIntentRequest) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *QueryCollectionRequest) Size() (n int) {
-	if m == nil {
-		return 0
-	}
+func (m *QueryIntentRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
 	var l int
 	_ = l
-	l = len(m.Id)
-	if l > 0 {
-		n += 1 + l + sovQuery(uint64(l))
+	if len(m.CollectionId) > 0 {
+		i -= len(m.CollectionId)
+		copy(dAtA[i:], m.CollectionId)
+		i = encodeVarintQuery(dAtA, i, uint64(len(m.CollectionId)))
+		i--
+		dAtA[i] = 0x1a
 	}
-	return n
+	if len(m.AgentAddress) > 0 {
+		i -= len(m.AgentAddress)
+		copy(dAtA[i:], m.AgentAddress)
+		i = encodeVarintQuery(dAtA, i, uint64(len(m.AgentAddress)))
+		i--
+		dAtA[i] = 0x12
+	}
+	if len(m.Id) > 0 {
+		i -= len(m.Id)
+		copy(dAtA[i:], m.Id)
+		i = encodeVarintQuery(dAtA, i, uint64(len(m.Id)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
 }
 
-func (m *QueryCollectionResponse) Size() (n int) {
-	if m == nil {
-		return 0
+func (m *QueryIntentResponse) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
 	}
-	var l int
-	_ = l
-	l = m.Collection.Size()
-	n += 1 + l + sovQuery(uint64(l))
-	return n
+	return dAtA[:n], nil
 }
 
-func (m *QueryCollectionListRequest) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.Pagination != nil {
-		l = m.Pagination.Size()
-		n += 1 + l + sovQuery(uint64(l))
-	}
-	return n
+func (m *QueryIntentResponse) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *QueryCollectionListResponse) Size() (n int) {
-	if m == nil {
-		return 0
-	}
+func (m *QueryIntentResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	{
+		size, err := m.Intent.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintQuery(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0xa
+	return len(dAtA) - i, nil
+}
+
+func (m *QueryIntentListRequest) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *QueryIntentListRequest) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *QueryIntentListRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.Pagination != nil {
+		{
+			size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintQuery(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *QueryIntentListResponse) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *QueryIntentListResponse) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *QueryIntentListResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.Pagination != nil {
+		{
+			size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintQuery(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x12
+	}
+	if len(m.Intents) > 0 {
+		for iNdEx := len(m.Intents) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.Intents[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintQuery(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0xa
+		}
+	}
+	return len(dAtA) - i, nil
+}
+
+func encodeVarintQuery(dAtA []byte, offset int, v uint64) int {
+	offset -= sovQuery(v)
+	base := offset
+	for v >= 1<<7 {
+		dAtA[offset] = uint8(v&0x7f | 0x80)
+		v >>= 7
+		offset++
+	}
+	dAtA[offset] = uint8(v)
+	return base
+}
+func (m *QueryParamsRequest) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	return n
+}
+
+func (m *QueryParamsResponse) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = m.Params.Size()
+	n += 1 + l + sovQuery(uint64(l))
+	return n
+}
+
+func (m *QueryCollectionRequest) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.Id)
+	if l > 0 {
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	return n
+}
+
+func (m *QueryCollectionResponse) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = m.Collection.Size()
+	n += 1 + l + sovQuery(uint64(l))
+	return n
+}
+
+func (m *QueryCollectionListRequest) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.Pagination != nil {
+		l = m.Pagination.Size()
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	return n
+}
+
+func (m *QueryCollectionListResponse) Size() (n int) {
+	if m == nil {
+		return 0
+	}
 	var l int
 	_ = l
 	if len(m.Collections) > 0 {
@@ -1724,16 +2170,378 @@ func (m *QueryDisputeListResponse) Size() (n int) {
 		l = m.Pagination.Size()
 		n += 1 + l + sovQuery(uint64(l))
 	}
-	return n
-}
+	return n
+}
+
+func (m *QueryIntentRequest) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.Id)
+	if l > 0 {
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	l = len(m.AgentAddress)
+	if l > 0 {
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	l = len(m.CollectionId)
+	if l > 0 {
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	return n
+}
+
+func (m *QueryIntentResponse) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = m.Intent.Size()
+	n += 1 + l + sovQuery(uint64(l))
+	return n
+}
+
+func (m *QueryIntentListRequest) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.Pagination != nil {
+		l = m.Pagination.Size()
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	return n
+}
+
+func (m *QueryIntentListResponse) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if len(m.Intents) > 0 {
+		for _, e := range m.Intents {
+			l = e.Size()
+			n += 1 + l + sovQuery(uint64(l))
+		}
+	}
+	if m.Pagination != nil {
+		l = m.Pagination.Size()
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	return n
+}
+
+func sovQuery(x uint64) (n int) {
+	return (math_bits.Len64(x|1) + 6) / 7
+}
+func sozQuery(x uint64) (n int) {
+	return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+}
+func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowQuery
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: QueryParamsRequest: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: QueryParamsRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		default:
+			iNdEx = preIndex
+			skippy, err := skipQuery(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowQuery
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: QueryParamsResponse: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: QueryParamsResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipQuery(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *QueryCollectionRequest) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowQuery
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: QueryCollectionRequest: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: QueryCollectionRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Id = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipQuery(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *QueryCollectionResponse) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowQuery
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: QueryCollectionResponse: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: QueryCollectionResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Collection", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.Collection.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipQuery(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
 
-func sovQuery(x uint64) (n int) {
-	return (math_bits.Len64(x|1) + 6) / 7
-}
-func sozQuery(x uint64) (n int) {
-	return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
 }
-func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error {
+func (m *QueryCollectionListRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1756,12 +2564,48 @@ func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: QueryParamsRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: QueryCollectionListRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QueryParamsRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: QueryCollectionListRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Pagination == nil {
+				m.Pagination = &query.PageRequest{}
+			}
+			if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipQuery(dAtA[iNdEx:])
@@ -1783,7 +2627,7 @@ func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error {
+func (m *QueryCollectionListResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1806,15 +2650,15 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: QueryParamsResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: QueryCollectionListResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QueryParamsResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: QueryCollectionListResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Collections", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -1841,7 +2685,44 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			m.Collections = append(m.Collections, Collection{})
+			if err := m.Collections[len(m.Collections)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Pagination == nil {
+				m.Pagination = &query.PageResponse{}
+			}
+			if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
@@ -1866,7 +2747,7 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *QueryCollectionRequest) Unmarshal(dAtA []byte) error {
+func (m *QueryClaimRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1889,10 +2770,10 @@ func (m *QueryCollectionRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: QueryCollectionRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: QueryClaimRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QueryCollectionRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: QueryClaimRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -1948,7 +2829,7 @@ func (m *QueryCollectionRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *QueryCollectionResponse) Unmarshal(dAtA []byte) error {
+func (m *QueryClaimResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1971,15 +2852,15 @@ func (m *QueryCollectionResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: QueryCollectionResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: QueryClaimResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QueryCollectionResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: QueryClaimResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Collection", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Claim", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -2006,7 +2887,7 @@ func (m *QueryCollectionResponse) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if err := m.Collection.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := m.Claim.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
@@ -2031,7 +2912,7 @@ func (m *QueryCollectionResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *QueryCollectionListRequest) Unmarshal(dAtA []byte) error {
+func (m *QueryClaimListRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -2054,10 +2935,10 @@ func (m *QueryCollectionListRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: QueryCollectionListRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: QueryClaimListRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QueryCollectionListRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: QueryClaimListRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -2117,7 +2998,7 @@ func (m *QueryCollectionListRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *QueryCollectionListResponse) Unmarshal(dAtA []byte) error {
+func (m *QueryClaimListResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -2140,15 +3021,15 @@ func (m *QueryCollectionListResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: QueryCollectionListResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: QueryClaimListResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QueryCollectionListResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: QueryClaimListResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Collections", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Claims", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -2175,8 +3056,8 @@ func (m *QueryCollectionListResponse) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Collections = append(m.Collections, Collection{})
-			if err := m.Collections[len(m.Collections)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			m.Claims = append(m.Claims, Claim{})
+			if err := m.Claims[len(m.Claims)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
@@ -2237,7 +3118,7 @@ func (m *QueryCollectionListResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *QueryClaimRequest) Unmarshal(dAtA []byte) error {
+func (m *QueryDisputeRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -2260,15 +3141,15 @@ func (m *QueryClaimRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: QueryClaimRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: QueryDisputeRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QueryClaimRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: QueryDisputeRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Proof", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -2296,7 +3177,7 @@ func (m *QueryClaimRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Id = string(dAtA[iNdEx:postIndex])
+			m.Proof = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
@@ -2319,7 +3200,7 @@ func (m *QueryClaimRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *QueryClaimResponse) Unmarshal(dAtA []byte) error {
+func (m *QueryDisputeResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -2342,15 +3223,15 @@ func (m *QueryClaimResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: QueryClaimResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: QueryDisputeResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QueryClaimResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: QueryDisputeResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Claim", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Dispute", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -2377,7 +3258,7 @@ func (m *QueryClaimResponse) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if err := m.Claim.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := m.Dispute.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
@@ -2402,7 +3283,7 @@ func (m *QueryClaimResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *QueryClaimListRequest) Unmarshal(dAtA []byte) error {
+func (m *QueryDisputeListRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -2425,10 +3306,10 @@ func (m *QueryClaimListRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: QueryClaimListRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: QueryDisputeListRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QueryClaimListRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: QueryDisputeListRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -2488,7 +3369,7 @@ func (m *QueryClaimListRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *QueryClaimListResponse) Unmarshal(dAtA []byte) error {
+func (m *QueryDisputeListResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -2511,15 +3392,15 @@ func (m *QueryClaimListResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: QueryClaimListResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: QueryDisputeListResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QueryClaimListResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: QueryDisputeListResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Claims", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Disputes", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -2546,8 +3427,8 @@ func (m *QueryClaimListResponse) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Claims = append(m.Claims, Claim{})
-			if err := m.Claims[len(m.Claims)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			m.Disputes = append(m.Disputes, Dispute{})
+			if err := m.Disputes[len(m.Disputes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
@@ -2608,7 +3489,7 @@ func (m *QueryClaimListResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *QueryDisputeRequest) Unmarshal(dAtA []byte) error {
+func (m *QueryIntentRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -2631,15 +3512,15 @@ func (m *QueryDisputeRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: QueryDisputeRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: QueryIntentRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QueryDisputeRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: QueryIntentRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Proof", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -2667,7 +3548,71 @@ func (m *QueryDisputeRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Proof = string(dAtA[iNdEx:postIndex])
+			m.Id = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field AgentAddress", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.AgentAddress = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field CollectionId", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.CollectionId = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
@@ -2690,7 +3635,7 @@ func (m *QueryDisputeRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *QueryDisputeResponse) Unmarshal(dAtA []byte) error {
+func (m *QueryIntentResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -2713,15 +3658,15 @@ func (m *QueryDisputeResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: QueryDisputeResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: QueryIntentResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QueryDisputeResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: QueryIntentResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Dispute", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Intent", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -2748,7 +3693,7 @@ func (m *QueryDisputeResponse) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if err := m.Dispute.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := m.Intent.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
@@ -2773,7 +3718,7 @@ func (m *QueryDisputeResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *QueryDisputeListRequest) Unmarshal(dAtA []byte) error {
+func (m *QueryIntentListRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -2796,10 +3741,10 @@ func (m *QueryDisputeListRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: QueryDisputeListRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: QueryIntentListRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QueryDisputeListRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: QueryIntentListRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -2859,7 +3804,7 @@ func (m *QueryDisputeListRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *QueryDisputeListResponse) Unmarshal(dAtA []byte) error {
+func (m *QueryIntentListResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -2882,15 +3827,15 @@ func (m *QueryDisputeListResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: QueryDisputeListResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: QueryIntentListResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QueryDisputeListResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: QueryIntentListResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Disputes", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Intents", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -2917,8 +3862,8 @@ func (m *QueryDisputeListResponse) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Disputes = append(m.Disputes, Dispute{})
-			if err := m.Disputes[len(m.Disputes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			m.Intents = append(m.Intents, Intent{})
+			if err := m.Intents[len(m.Intents)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
diff --git a/x/claims/types/query.pb.gw.go b/x/claims/types/query.pb.gw.go
index 6c1f2562..c9f7c87e 100644
--- a/x/claims/types/query.pb.gw.go
+++ b/x/claims/types/query.pb.gw.go
@@ -321,6 +321,140 @@ func local_request_Query_DisputeList_0(ctx context.Context, marshaler runtime.Ma
 
 }
 
+func request_Query_Intent_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq QueryIntentRequest
+	var metadata runtime.ServerMetadata
+
+	var (
+		val string
+		ok  bool
+		err error
+		_   = err
+	)
+
+	val, ok = pathParams["agentAddress"]
+	if !ok {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "agentAddress")
+	}
+
+	protoReq.AgentAddress, err = runtime.String(val)
+
+	if err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "agentAddress", err)
+	}
+
+	val, ok = pathParams["collectionId"]
+	if !ok {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "collectionId")
+	}
+
+	protoReq.CollectionId, err = runtime.String(val)
+
+	if err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "collectionId", err)
+	}
+
+	val, ok = pathParams["id"]
+	if !ok {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")
+	}
+
+	protoReq.Id, err = runtime.String(val)
+
+	if err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)
+	}
+
+	msg, err := client.Intent(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
+func local_request_Query_Intent_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq QueryIntentRequest
+	var metadata runtime.ServerMetadata
+
+	var (
+		val string
+		ok  bool
+		err error
+		_   = err
+	)
+
+	val, ok = pathParams["agentAddress"]
+	if !ok {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "agentAddress")
+	}
+
+	protoReq.AgentAddress, err = runtime.String(val)
+
+	if err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "agentAddress", err)
+	}
+
+	val, ok = pathParams["collectionId"]
+	if !ok {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "collectionId")
+	}
+
+	protoReq.CollectionId, err = runtime.String(val)
+
+	if err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "collectionId", err)
+	}
+
+	val, ok = pathParams["id"]
+	if !ok {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")
+	}
+
+	protoReq.Id, err = runtime.String(val)
+
+	if err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)
+	}
+
+	msg, err := server.Intent(ctx, &protoReq)
+	return msg, metadata, err
+
+}
+
+var (
+	filter_Query_IntentList_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+)
+
+func request_Query_IntentList_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq QueryIntentListRequest
+	var metadata runtime.ServerMetadata
+
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_IntentList_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	msg, err := client.IntentList(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
+func local_request_Query_IntentList_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq QueryIntentListRequest
+	var metadata runtime.ServerMetadata
+
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_IntentList_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	msg, err := server.IntentList(ctx, &protoReq)
+	return msg, metadata, err
+
+}
+
 // RegisterQueryHandlerServer registers the http handlers for service Query to "mux".
 // UnaryRPC     :call QueryServer directly.
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
@@ -488,6 +622,52 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 
 	})
 
+	mux.Handle("GET", pattern_Query_Intent_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := local_request_Query_Intent_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_Query_Intent_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
+	mux.Handle("GET", pattern_Query_IntentList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := local_request_Query_IntentList_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_Query_IntentList_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
 	return nil
 }
 
@@ -669,6 +849,46 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 
 	})
 
+	mux.Handle("GET", pattern_Query_Intent_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_Query_Intent_0(rctx, inboundMarshaler, client, req, pathParams)
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_Query_Intent_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
+	mux.Handle("GET", pattern_Query_IntentList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_Query_IntentList_0(rctx, inboundMarshaler, client, req, pathParams)
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_Query_IntentList_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
 	return nil
 }
 
@@ -686,6 +906,10 @@ var (
 	pattern_Query_Dispute_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"ixo", "dispute", "proof"}, "", runtime.AssumeColonVerbOpt(false)))
 
 	pattern_Query_DisputeList_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"ixo", "dispute"}, "", runtime.AssumeColonVerbOpt(false)))
+
+	pattern_Query_Intent_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"ixo", "intent", "agentAddress", "collectionId", "id"}, "", runtime.AssumeColonVerbOpt(false)))
+
+	pattern_Query_IntentList_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"ixo", "intent"}, "", runtime.AssumeColonVerbOpt(false)))
 )
 
 var (
@@ -702,4 +926,8 @@ var (
 	forward_Query_Dispute_0 = runtime.ForwardResponseMessage
 
 	forward_Query_DisputeList_0 = runtime.ForwardResponseMessage
+
+	forward_Query_Intent_0 = runtime.ForwardResponseMessage
+
+	forward_Query_IntentList_0 = runtime.ForwardResponseMessage
 )
diff --git a/x/claims/types/tx.go b/x/claims/types/tx.go
index 8ffe0106..cdb33282 100755
--- a/x/claims/types/tx.go
+++ b/x/claims/types/tx.go
@@ -105,3 +105,27 @@ var _ sdk.Msg = &MsgUpdateCollectionPayments{}
 func (msg MsgUpdateCollectionPayments) Type() string { return TypeMsgUpdateCollectionPayments }
 
 func (msg MsgUpdateCollectionPayments) Route() string { return RouterKey }
+
+// --------------------------
+// UPDATE COLLECTION INTENTS
+// --------------------------
+const TypeMsgUpdateCollectionIntents = "update_collection_intents"
+
+var _ sdk.Msg = &MsgUpdateCollectionIntents{}
+
+func (msg MsgUpdateCollectionIntents) Type() string { return TypeMsgUpdateCollectionIntents }
+
+func (msg MsgUpdateCollectionIntents) Route() string { return RouterKey }
+
+// --------------------------
+// CLAIM INTENT
+// --------------------------
+const TypeMsgClaimIntent = "claim_intent"
+
+var _ sdk.Msg = &MsgClaimIntent{}
+
+func (msg MsgClaimIntent) Type() string { return TypeMsgClaimIntent }
+
+func (msg MsgClaimIntent) GetIidController() iidtypes.DIDFragment { return msg.AgentDid }
+
+func (msg MsgClaimIntent) Route() string { return RouterKey }
diff --git a/x/claims/types/tx.pb.go b/x/claims/types/tx.pb.go
index 610cfee3..4242c450 100644
--- a/x/claims/types/tx.pb.go
+++ b/x/claims/types/tx.pb.go
@@ -56,6 +56,9 @@ type MsgCreateCollection struct {
 	// payments is the amount paid for claim submission, evaluation, approval, or
 	// rejection
 	Payments *Payments `protobuf:"bytes,8,opt,name=payments,proto3" json:"payments,omitempty"`
+	// intents is the option for intents for this collection (allow, deny,
+	// required)
+	Intents CollectionIntentOptions `protobuf:"varint,9,opt,name=intents,proto3,enum=ixo.claims.v1beta1.CollectionIntentOptions" json:"intents,omitempty"`
 }
 
 func (m *MsgCreateCollection) Reset()         { *m = MsgCreateCollection{} }
@@ -147,6 +150,13 @@ func (m *MsgCreateCollection) GetPayments() *Payments {
 	return nil
 }
 
+func (m *MsgCreateCollection) GetIntents() CollectionIntentOptions {
+	if m != nil {
+		return m.Intents
+	}
+	return CollectionIntentOptions_allow
+}
+
 type MsgCreateCollectionResponse struct {
 }
 
@@ -193,6 +203,18 @@ type MsgSubmitClaim struct {
 	AgentAddress string                                                             `protobuf:"bytes,4,opt,name=agent_address,json=agentAddress,proto3" json:"agent_address,omitempty"`
 	// admin address used to sign this message, validated against Collection Admin
 	AdminAddress string `protobuf:"bytes,5,opt,name=admin_address,json=adminAddress,proto3" json:"admin_address,omitempty"`
+	// use_intent is the option for using intent for this claim if it exists and
+	// is active. NOTE: if use_intent is true then amount and cw20 amount are
+	// ignored and overriden with intent amounts. NOTE: if use_intent is true and
+	// there is no active intent then will error
+	UseIntent bool `protobuf:"varint,6,opt,name=use_intent,json=useIntent,proto3" json:"use_intent,omitempty"`
+	// NOTE: if both amount and cw20_payment are empty then use default by
+	// Collection custom amount specified by service agent for claim approval
+	Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,7,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount"`
+	// NOTE: if both amount and cw20 amount are empty then use default by
+	// Collection custom cw20 payments specified by service agent for claim
+	// approval
+	Cw20Payment []*CW20Payment `protobuf:"bytes,8,rep,name=cw20_payment,json=cw20Payment,proto3" json:"cw20_payment,omitempty"`
 }
 
 func (m *MsgSubmitClaim) Reset()         { *m = MsgSubmitClaim{} }
@@ -263,6 +285,27 @@ func (m *MsgSubmitClaim) GetAdminAddress() string {
 	return ""
 }
 
+func (m *MsgSubmitClaim) GetUseIntent() bool {
+	if m != nil {
+		return m.UseIntent
+	}
+	return false
+}
+
+func (m *MsgSubmitClaim) GetAmount() github_com_cosmos_cosmos_sdk_types.Coins {
+	if m != nil {
+		return m.Amount
+	}
+	return nil
+}
+
+func (m *MsgSubmitClaim) GetCw20Payment() []*CW20Payment {
+	if m != nil {
+		return m.Cw20Payment
+	}
+	return nil
+}
+
 type MsgSubmitClaimResponse struct {
 }
 
@@ -319,11 +362,11 @@ type MsgEvaluateClaim struct {
 	Reason uint32 `protobuf:"varint,8,opt,name=reason,proto3" json:"reason,omitempty"`
 	// verificationProof is the cid of the evaluation Verfiable Credential
 	VerificationProof string `protobuf:"bytes,9,opt,name=verification_proof,json=verificationProof,proto3" json:"verification_proof,omitempty"`
-	// custom amount specified by evaluator for claim approval, if empty list then
-	// use default by Collection
+	// NOTE: if both amount and cw20 amount are empty then use collection default
+	// custom amount specified by evaluator for claim approval
 	Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,10,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount"`
-	// custom cw20 payments specified by evaluator for claim approval, if empty
-	// list then use default by Collection
+	// NOTE: if both amount and cw20 amount are empty then use collection default
+	// custom cw20 payments specified by evaluator for claim approval
 	Cw20Payment []*CW20Payment `protobuf:"bytes,11,rep,name=cw20_payment,json=cw20Payment,proto3" json:"cw20_payment,omitempty"`
 }
 
@@ -1065,6 +1108,245 @@ func (m *MsgUpdateCollectionPaymentsResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_MsgUpdateCollectionPaymentsResponse proto.InternalMessageInfo
 
+type MsgUpdateCollectionIntents struct {
+	// collection_id indicates which Collection to update
+	CollectionId string `protobuf:"bytes,1,opt,name=collection_id,json=collectionId,proto3" json:"collection_id,omitempty"`
+	// intents is the option for intents for this collection (allow, deny,
+	// required)
+	Intents CollectionIntentOptions `protobuf:"varint,2,opt,name=intents,proto3,enum=ixo.claims.v1beta1.CollectionIntentOptions" json:"intents,omitempty"`
+	// admin address used to sign this message, validated against Collection Admin
+	AdminAddress string `protobuf:"bytes,3,opt,name=admin_address,json=adminAddress,proto3" json:"admin_address,omitempty"`
+}
+
+func (m *MsgUpdateCollectionIntents) Reset()         { *m = MsgUpdateCollectionIntents{} }
+func (m *MsgUpdateCollectionIntents) String() string { return proto.CompactTextString(m) }
+func (*MsgUpdateCollectionIntents) ProtoMessage()    {}
+func (*MsgUpdateCollectionIntents) Descriptor() ([]byte, []int) {
+	return fileDescriptor_e0095508349b828a, []int{16}
+}
+func (m *MsgUpdateCollectionIntents) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *MsgUpdateCollectionIntents) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_MsgUpdateCollectionIntents.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *MsgUpdateCollectionIntents) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgUpdateCollectionIntents.Merge(m, src)
+}
+func (m *MsgUpdateCollectionIntents) XXX_Size() int {
+	return m.Size()
+}
+func (m *MsgUpdateCollectionIntents) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgUpdateCollectionIntents.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgUpdateCollectionIntents proto.InternalMessageInfo
+
+func (m *MsgUpdateCollectionIntents) GetCollectionId() string {
+	if m != nil {
+		return m.CollectionId
+	}
+	return ""
+}
+
+func (m *MsgUpdateCollectionIntents) GetIntents() CollectionIntentOptions {
+	if m != nil {
+		return m.Intents
+	}
+	return CollectionIntentOptions_allow
+}
+
+func (m *MsgUpdateCollectionIntents) GetAdminAddress() string {
+	if m != nil {
+		return m.AdminAddress
+	}
+	return ""
+}
+
+type MsgUpdateCollectionIntentsResponse struct {
+}
+
+func (m *MsgUpdateCollectionIntentsResponse) Reset()         { *m = MsgUpdateCollectionIntentsResponse{} }
+func (m *MsgUpdateCollectionIntentsResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgUpdateCollectionIntentsResponse) ProtoMessage()    {}
+func (*MsgUpdateCollectionIntentsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_e0095508349b828a, []int{17}
+}
+func (m *MsgUpdateCollectionIntentsResponse) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *MsgUpdateCollectionIntentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_MsgUpdateCollectionIntentsResponse.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *MsgUpdateCollectionIntentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgUpdateCollectionIntentsResponse.Merge(m, src)
+}
+func (m *MsgUpdateCollectionIntentsResponse) XXX_Size() int {
+	return m.Size()
+}
+func (m *MsgUpdateCollectionIntentsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgUpdateCollectionIntentsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgUpdateCollectionIntentsResponse proto.InternalMessageInfo
+
+type MsgClaimIntent struct {
+	// The service agent's DID (Decentralized Identifier).
+	AgentDid github_com_ixofoundation_ixo_blockchain_v3_x_iid_types.DIDFragment `protobuf:"bytes,1,opt,name=agent_did,json=agentDid,proto3,casttype=github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment" json:"agent_did,omitempty"`
+	// The service agent's address (who submits this message).
+	AgentAddress string `protobuf:"bytes,2,opt,name=agent_address,json=agentAddress,proto3" json:"agent_address,omitempty"`
+	// The id of the collection this intent is linked to.
+	CollectionId string `protobuf:"bytes,3,opt,name=collection_id,json=collectionId,proto3" json:"collection_id,omitempty"`
+	// NOTE: if both amount and cw20 amount are empty then default by Collection
+	// is used (APPROVAL payment). The desired claim amount, if any.
+	Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,4,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount"`
+	// NOTE: if both amount and cw20 amount are empty then default by Collection
+	// is used (APPROVAL payment). The custom CW20 payment, if any.
+	Cw20Payment []*CW20Payment `protobuf:"bytes,5,rep,name=cw20_payment,json=cw20Payment,proto3" json:"cw20_payment,omitempty"`
+}
+
+func (m *MsgClaimIntent) Reset()         { *m = MsgClaimIntent{} }
+func (m *MsgClaimIntent) String() string { return proto.CompactTextString(m) }
+func (*MsgClaimIntent) ProtoMessage()    {}
+func (*MsgClaimIntent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_e0095508349b828a, []int{18}
+}
+func (m *MsgClaimIntent) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *MsgClaimIntent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_MsgClaimIntent.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *MsgClaimIntent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgClaimIntent.Merge(m, src)
+}
+func (m *MsgClaimIntent) XXX_Size() int {
+	return m.Size()
+}
+func (m *MsgClaimIntent) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgClaimIntent.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgClaimIntent proto.InternalMessageInfo
+
+func (m *MsgClaimIntent) GetAgentDid() github_com_ixofoundation_ixo_blockchain_v3_x_iid_types.DIDFragment {
+	if m != nil {
+		return m.AgentDid
+	}
+	return ""
+}
+
+func (m *MsgClaimIntent) GetAgentAddress() string {
+	if m != nil {
+		return m.AgentAddress
+	}
+	return ""
+}
+
+func (m *MsgClaimIntent) GetCollectionId() string {
+	if m != nil {
+		return m.CollectionId
+	}
+	return ""
+}
+
+func (m *MsgClaimIntent) GetAmount() github_com_cosmos_cosmos_sdk_types.Coins {
+	if m != nil {
+		return m.Amount
+	}
+	return nil
+}
+
+func (m *MsgClaimIntent) GetCw20Payment() []*CW20Payment {
+	if m != nil {
+		return m.Cw20Payment
+	}
+	return nil
+}
+
+// MsgClaimIntentResponse defines the response after submitting an intent.
+type MsgClaimIntentResponse struct {
+	// Resulting intent id.
+	IntentId string `protobuf:"bytes,1,opt,name=intent_id,json=intentId,proto3" json:"intent_id,omitempty"`
+	// Timeout period for the intent. If the claim is not submitted by this time,
+	// the intent expires.
+	ExpireAt *time.Time `protobuf:"bytes,2,opt,name=expire_at,json=expireAt,proto3,stdtime" json:"expire_at,omitempty"`
+}
+
+func (m *MsgClaimIntentResponse) Reset()         { *m = MsgClaimIntentResponse{} }
+func (m *MsgClaimIntentResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgClaimIntentResponse) ProtoMessage()    {}
+func (*MsgClaimIntentResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_e0095508349b828a, []int{19}
+}
+func (m *MsgClaimIntentResponse) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *MsgClaimIntentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_MsgClaimIntentResponse.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *MsgClaimIntentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgClaimIntentResponse.Merge(m, src)
+}
+func (m *MsgClaimIntentResponse) XXX_Size() int {
+	return m.Size()
+}
+func (m *MsgClaimIntentResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgClaimIntentResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgClaimIntentResponse proto.InternalMessageInfo
+
+func (m *MsgClaimIntentResponse) GetIntentId() string {
+	if m != nil {
+		return m.IntentId
+	}
+	return ""
+}
+
+func (m *MsgClaimIntentResponse) GetExpireAt() *time.Time {
+	if m != nil {
+		return m.ExpireAt
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*MsgCreateCollection)(nil), "ixo.claims.v1beta1.MsgCreateCollection")
 	proto.RegisterType((*MsgCreateCollectionResponse)(nil), "ixo.claims.v1beta1.MsgCreateCollectionResponse")
@@ -1082,92 +1364,108 @@ func init() {
 	proto.RegisterType((*MsgUpdateCollectionDatesResponse)(nil), "ixo.claims.v1beta1.MsgUpdateCollectionDatesResponse")
 	proto.RegisterType((*MsgUpdateCollectionPayments)(nil), "ixo.claims.v1beta1.MsgUpdateCollectionPayments")
 	proto.RegisterType((*MsgUpdateCollectionPaymentsResponse)(nil), "ixo.claims.v1beta1.MsgUpdateCollectionPaymentsResponse")
+	proto.RegisterType((*MsgUpdateCollectionIntents)(nil), "ixo.claims.v1beta1.MsgUpdateCollectionIntents")
+	proto.RegisterType((*MsgUpdateCollectionIntentsResponse)(nil), "ixo.claims.v1beta1.MsgUpdateCollectionIntentsResponse")
+	proto.RegisterType((*MsgClaimIntent)(nil), "ixo.claims.v1beta1.MsgClaimIntent")
+	proto.RegisterType((*MsgClaimIntentResponse)(nil), "ixo.claims.v1beta1.MsgClaimIntentResponse")
 }
 
 func init() { proto.RegisterFile("ixo/claims/v1beta1/tx.proto", fileDescriptor_e0095508349b828a) }
 
 var fileDescriptor_e0095508349b828a = []byte{
-	// 1277 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5b, 0x6f, 0x1b, 0x45,
-	0x14, 0x8e, 0x2f, 0x71, 0xec, 0xe3, 0xf4, 0xc2, 0xf4, 0xb6, 0xdd, 0xb6, 0x8e, 0x71, 0x0a, 0x44,
-	0x85, 0xee, 0x36, 0x29, 0x15, 0xbd, 0x20, 0xa1, 0x3a, 0xa1, 0x52, 0x1e, 0x22, 0xaa, 0x6d, 0x51,
-	0x25, 0x10, 0x32, 0xe3, 0xdd, 0xc9, 0x76, 0x88, 0xbd, 0x63, 0x76, 0x66, 0xd3, 0x44, 0xbc, 0x21,
-	0x78, 0xaf, 0xc4, 0x7f, 0xe0, 0x81, 0x27, 0x24, 0xc4, 0x7f, 0x28, 0x6f, 0x7d, 0x44, 0x42, 0x6a,
-	0x51, 0xfb, 0xc0, 0x3f, 0x00, 0x89, 0x27, 0x34, 0xb3, 0xb3, 0xeb, 0xdb, 0xba, 0x6c, 0x28, 0xea,
-	0xd3, 0xfa, 0xcc, 0xf9, 0xbe, 0x39, 0x33, 0xdf, 0x9c, 0x39, 0x73, 0x64, 0x38, 0x43, 0xf7, 0x98,
-	0xed, 0xf6, 0x30, 0xed, 0x73, 0x7b, 0x77, 0xb5, 0x4b, 0x04, 0x5e, 0xb5, 0xc5, 0x9e, 0x35, 0x08,
-	0x99, 0x60, 0x08, 0xd1, 0x3d, 0x66, 0xc5, 0x4e, 0x4b, 0x3b, 0xcd, 0xe3, 0x3e, 0xf3, 0x99, 0x72,
-	0xdb, 0xf2, 0x57, 0x8c, 0x34, 0x97, 0x7c, 0xc6, 0xfc, 0x1e, 0xb1, 0x95, 0xd5, 0x8d, 0xb6, 0x6d,
-	0x41, 0xfb, 0x84, 0x0b, 0xdc, 0x1f, 0x24, 0x80, 0x8c, 0x38, 0x7a, 0xe6, 0x18, 0xd0, 0x70, 0x19,
-	0xef, 0x33, 0x6e, 0x77, 0x31, 0x27, 0x43, 0x04, 0xa3, 0xc1, 0x94, 0x3f, 0xd8, 0x49, 0xfd, 0xd2,
-	0xd0, 0xfe, 0x53, 0xda, 0xdf, 0xe7, 0xbe, 0xbd, 0xbb, 0x2a, 0x3f, 0xb1, 0xa3, 0xf5, 0x57, 0x11,
-	0x8e, 0x6d, 0x71, 0x7f, 0x3d, 0x24, 0x58, 0x90, 0x75, 0xd6, 0xeb, 0x11, 0x57, 0x50, 0x16, 0xa0,
-	0x93, 0x50, 0x21, 0x81, 0xa0, 0x62, 0xdf, 0x28, 0x34, 0x0b, 0x2b, 0x35, 0x47, 0x5b, 0x72, 0x9c,
-	0x53, 0x3f, 0x20, 0xa1, 0x51, 0x8c, 0xc7, 0x63, 0x0b, 0x99, 0x50, 0x55, 0x13, 0xba, 0xac, 0x67,
-	0x94, 0x94, 0x27, 0xb5, 0xd1, 0x07, 0x00, 0x5c, 0xe0, 0x50, 0x74, 0x3c, 0x2c, 0x88, 0x51, 0x6e,
-	0x16, 0x56, 0xea, 0x6b, 0xa6, 0x15, 0x6b, 0x62, 0x25, 0x9a, 0x58, 0x77, 0x13, 0x4d, 0xda, 0xe5,
-	0x87, 0x4f, 0x97, 0x0a, 0x4e, 0x4d, 0x71, 0x36, 0xb0, 0x20, 0xe8, 0x06, 0x54, 0x49, 0xe0, 0xc5,
-	0xf4, 0xf9, 0x9c, 0xf4, 0x05, 0x12, 0x78, 0x8a, 0x7c, 0x1c, 0xe6, 0xbf, 0x8c, 0x98, 0xc0, 0x46,
-	0xa5, 0x59, 0x58, 0x29, 0x3b, 0xb1, 0x81, 0xae, 0xc1, 0x3c, 0x17, 0x72, 0xbe, 0x85, 0x66, 0x61,
-	0xe5, 0xf0, 0xda, 0xb2, 0x35, 0x7d, 0x98, 0xd6, 0x50, 0x8e, 0x3b, 0x12, 0xea, 0xc4, 0x0c, 0x74,
-	0x15, 0xaa, 0x03, 0xbc, 0xdf, 0x27, 0x81, 0xe0, 0x46, 0x55, 0xad, 0xe6, 0x6c, 0x16, 0xfb, 0xb6,
-	0xc6, 0x38, 0x29, 0xfa, 0x7a, 0xfd, 0xeb, 0x3f, 0x7e, 0xbc, 0xa0, 0x15, 0x6b, 0x9d, 0x83, 0x33,
-	0x19, 0xc2, 0x3b, 0x84, 0x0f, 0x58, 0xc0, 0x49, 0xeb, 0xbb, 0x22, 0x1c, 0xde, 0xe2, 0xfe, 0x9d,
-	0xa8, 0xdb, 0xa7, 0x62, 0x5d, 0x4e, 0x8d, 0x96, 0xe1, 0x90, 0x9b, 0x02, 0x3b, 0xd4, 0xd3, 0x47,
-	0xb3, 0x38, 0x1c, 0xdc, 0xf4, 0xd0, 0x69, 0xa8, 0xaa, 0x85, 0x48, 0x7f, 0x7c, 0x44, 0x0b, 0xca,
-	0xde, 0xf4, 0x90, 0x0b, 0x35, 0xec, 0x93, 0x40, 0x74, 0x3c, 0xea, 0xc5, 0x87, 0xd4, 0xbe, 0xf5,
-	0xf7, 0x93, 0xa5, 0xb6, 0x4f, 0xc5, 0xfd, 0xa8, 0x6b, 0xb9, 0xac, 0x6f, 0xd3, 0x3d, 0xb6, 0xcd,
-	0xa2, 0xc0, 0xc3, 0x72, 0x36, 0x69, 0x5d, 0xec, 0xf6, 0x98, 0xbb, 0xe3, 0xde, 0xc7, 0x34, 0xb0,
-	0x77, 0x2f, 0xdb, 0x7b, 0x36, 0xa5, 0x9e, 0x2d, 0xf6, 0x07, 0x84, 0x5b, 0x1b, 0x9b, 0x1b, 0xb7,
-	0x42, 0xec, 0xcb, 0xad, 0x39, 0x55, 0x35, 0xf1, 0x06, 0xf5, 0xe4, 0x22, 0xe3, 0x20, 0xd8, 0xf3,
-	0x42, 0xc2, 0xb9, 0x3a, 0xef, 0x9a, 0xb3, 0xa8, 0x06, 0x6f, 0xc6, 0x63, 0x0a, 0xe4, 0xf5, 0x69,
-	0x90, 0x82, 0xe6, 0x35, 0x48, 0x0e, 0x6a, 0xd0, 0x75, 0x24, 0xd5, 0x1a, 0xc7, 0xb5, 0x0c, 0x38,
-	0x39, 0x2e, 0x4a, 0xaa, 0xd7, 0x6f, 0x65, 0x38, 0xba, 0xc5, 0xfd, 0x0f, 0x77, 0x71, 0x2f, 0x92,
-	0x8a, 0x2a, 0xc5, 0x46, 0xc5, 0x28, 0x8c, 0x8b, 0x31, 0x25, 0x66, 0x31, 0x43, 0xcc, 0x93, 0x50,
-	0x61, 0x21, 0x76, 0x7b, 0x44, 0xe7, 0xb4, 0xb6, 0xc6, 0x95, 0x2c, 0xbf, 0x2a, 0x25, 0xe7, 0xf3,
-	0x28, 0x59, 0x99, 0x56, 0x12, 0xbd, 0x0f, 0x15, 0x99, 0xba, 0x11, 0xd7, 0xd9, 0x7e, 0x3e, 0x2b,
-	0x5f, 0xb5, 0x72, 0x3a, 0xdb, 0x23, 0xee, 0x68, 0x8e, 0x14, 0x21, 0x24, 0x98, 0xb3, 0x40, 0x65,
-	0xfb, 0x21, 0x47, 0x5b, 0xe8, 0x22, 0xa0, 0x5d, 0x12, 0xd2, 0x6d, 0xea, 0x2a, 0x56, 0x67, 0x10,
-	0x32, 0xb6, 0x6d, 0xd4, 0x54, 0xfc, 0xd7, 0x46, 0x3d, 0xb7, 0xa5, 0x03, 0xb9, 0x50, 0xc1, 0x7d,
-	0x16, 0x05, 0xc2, 0x80, 0x66, 0x69, 0xa5, 0xbe, 0x76, 0xda, 0x8a, 0x6b, 0x92, 0x25, 0x6b, 0xda,
-	0xc8, 0x9d, 0xa3, 0x41, 0xfb, 0xd2, 0xa3, 0x27, 0x4b, 0x73, 0x3f, 0x3c, 0x5d, 0x5a, 0x19, 0xd1,
-	0x53, 0x17, 0xb0, 0xf8, 0x73, 0x91, 0x7b, 0x3b, 0x5a, 0x3b, 0x49, 0xe0, 0x8e, 0x9e, 0x1a, 0xb5,
-	0x61, 0xd1, 0x7d, 0xb0, 0x76, 0xa9, 0xa3, 0xaf, 0x9c, 0x51, 0x57, 0xa1, 0x96, 0x32, 0x6f, 0xf7,
-	0xbd, 0xb5, 0x4b, 0xfa, 0x8e, 0x3a, 0x75, 0x49, 0xd2, 0x46, 0x66, 0xde, 0x99, 0x60, 0x4c, 0x26,
-	0x57, 0x9a, 0x79, 0xdf, 0x17, 0xe1, 0xc8, 0x16, 0xf7, 0x37, 0x28, 0x1f, 0x44, 0x49, 0xe2, 0x9d,
-	0x03, 0xe0, 0x51, 0xf7, 0x0b, 0xe2, 0x8a, 0x61, 0xea, 0xd5, 0xf4, 0xc8, 0xe4, 0x4d, 0x2c, 0xbe,
-	0xaa, 0xfc, 0x29, 0x65, 0xe4, 0xcf, 0xeb, 0xb0, 0xe8, 0xc5, 0x0b, 0xef, 0xc8, 0xb9, 0x54, 0x32,
-	0xcf, 0x3b, 0x75, 0x3d, 0x76, 0x77, 0x7f, 0x40, 0xd0, 0x65, 0x28, 0x7b, 0x58, 0x60, 0x5d, 0x79,
-	0x33, 0xb5, 0xd4, 0x7b, 0xdf, 0xc0, 0x02, 0x3b, 0x0a, 0x9c, 0x88, 0x38, 0x1a, 0xbf, 0x75, 0x1a,
-	0x4e, 0x4d, 0xe8, 0x94, 0x6a, 0xf8, 0x4b, 0x19, 0xd0, 0x16, 0xf7, 0xef, 0x51, 0x71, 0xdf, 0x0b,
-	0xf1, 0x03, 0x7d, 0x14, 0x2f, 0xba, 0xbf, 0x57, 0xa1, 0x42, 0x83, 0x41, 0x24, 0xb8, 0x51, 0x54,
-	0x67, 0x6c, 0x0e, 0xd3, 0x29, 0xd8, 0x49, 0x17, 0xb6, 0x29, 0x21, 0xed, 0xb2, 0xcc, 0x27, 0x47,
-	0xe3, 0xd1, 0x0d, 0x58, 0x60, 0x91, 0x50, 0xd4, 0x92, 0xa2, 0x9e, 0xc9, 0xa4, 0x7e, 0xa4, 0x30,
-	0x9a, 0x9b, 0x30, 0x64, 0x82, 0xe9, 0xdc, 0x1a, 0xea, 0x75, 0x38, 0x5b, 0x14, 0xbd, 0x09, 0xa9,
-	0xa1, 0x53, 0x1f, 0x0c, 0x0d, 0xf4, 0x29, 0x9c, 0x70, 0x59, 0x20, 0x42, 0xec, 0x8a, 0xce, 0xea,
-	0xea, 0x95, 0x2b, 0x69, 0xb6, 0xc6, 0x0a, 0xbf, 0x95, 0xfd, 0x16, 0xc5, 0x04, 0x89, 0x4f, 0xb2,
-	0xf6, 0x98, 0x3b, 0x3d, 0x88, 0xce, 0x42, 0x4d, 0xb0, 0x9b, 0x63, 0xc5, 0x60, 0x38, 0x80, 0x9a,
-	0x50, 0xdf, 0x0e, 0x59, 0x3f, 0xf1, 0x2f, 0x28, 0xff, 0xe8, 0x10, 0x5a, 0x87, 0xc5, 0x90, 0xf4,
-	0x08, 0xe6, 0x24, 0x7e, 0x6f, 0xab, 0x39, 0xdf, 0xdb, 0xba, 0x66, 0xa9, 0x37, 0x77, 0xaa, 0x2a,
-	0xd5, 0x32, 0xaa, 0xd2, 0xe4, 0x5d, 0x85, 0xff, 0xe9, 0xae, 0x9e, 0x05, 0x73, 0x3a, 0x95, 0xd2,
-	0x4c, 0xfb, 0xa9, 0xa0, 0xae, 0xf2, 0xc7, 0x03, 0x6f, 0xec, 0xdd, 0x55, 0x2f, 0x7c, 0xbe, 0x17,
-	0x36, 0x6d, 0x1d, 0x8a, 0x07, 0x6e, 0x1d, 0xa6, 0x74, 0x29, 0xe5, 0x7c, 0xf7, 0x5a, 0xd0, 0x9c,
-	0xb5, 0xe8, 0x74, 0x67, 0x7f, 0x66, 0xef, 0x4c, 0x1e, 0x08, 0xcf, 0xb7, 0xb3, 0xf1, 0x46, 0xad,
-	0xf8, 0x72, 0x8d, 0x5a, 0xe9, 0xa0, 0x8d, 0xda, 0x94, 0x38, 0xe5, 0x97, 0x12, 0x47, 0xed, 0x3b,
-	0x15, 0xe7, 0xe7, 0x82, 0x6a, 0xb7, 0x26, 0x41, 0x49, 0x93, 0x96, 0x4f, 0x9f, 0xd1, 0xce, 0xaf,
-	0x78, 0x90, 0xce, 0xef, 0xbf, 0x1f, 0xfc, 0x1b, 0xb0, 0xfc, 0x82, 0x65, 0x27, 0xdb, 0x5b, 0xfb,
-	0x76, 0x01, 0x4a, 0x5b, 0xdc, 0x47, 0x3d, 0x38, 0x3a, 0xd5, 0xca, 0x67, 0xd6, 0x93, 0x8c, 0xd6,
-	0xd3, 0xb4, 0x73, 0x02, 0x93, 0xa8, 0xe8, 0x33, 0xa8, 0x8f, 0xf6, 0xa7, 0xad, 0x19, 0xfc, 0x11,
-	0x8c, 0x79, 0xe1, 0xdf, 0x31, 0xe9, 0xf4, 0x2e, 0x1c, 0x1a, 0x6f, 0xe7, 0xce, 0xcf, 0x20, 0x8f,
-	0xa1, 0xcc, 0x77, 0xf2, 0xa0, 0xd2, 0x20, 0x9f, 0xc3, 0xe2, 0xd8, 0xcb, 0xbd, 0x3c, 0x83, 0x3d,
-	0x0a, 0x32, 0xdf, 0xce, 0x01, 0x4a, 0x23, 0x50, 0x38, 0x32, 0xf9, 0xae, 0xbd, 0x39, 0x83, 0x3f,
-	0x81, 0x33, 0xad, 0x7c, 0xb8, 0x34, 0xd4, 0x57, 0x70, 0x22, 0xbb, 0xb0, 0xcd, 0xd2, 0x24, 0x13,
-	0x6d, 0xbe, 0x7b, 0x10, 0xf4, 0x8b, 0x82, 0xc7, 0xb5, 0x27, 0x6f, 0x70, 0x85, 0xce, 0x1d, 0x7c,
-	0xec, 0x7e, 0xa3, 0x6f, 0x0a, 0x60, 0xcc, 0xbc, 0xdc, 0x76, 0xce, 0x29, 0x13, 0x82, 0xf9, 0xde,
-	0x01, 0x09, 0xc9, 0x32, 0xda, 0x77, 0x1e, 0x3d, 0x6b, 0x14, 0x1e, 0x3f, 0x6b, 0x14, 0x7e, 0x7f,
-	0xd6, 0x28, 0x3c, 0x7c, 0xde, 0x98, 0x7b, 0xfc, 0xbc, 0x31, 0xf7, 0xeb, 0xf3, 0xc6, 0xdc, 0x27,
-	0xd7, 0x0e, 0xd4, 0xdb, 0xe9, 0xff, 0x02, 0x54, 0x7b, 0xd7, 0xad, 0xa8, 0xda, 0x79, 0xf9, 0x9f,
-	0x00, 0x00, 0x00, 0xff, 0xff, 0xdf, 0x7d, 0x99, 0x02, 0x8e, 0x10, 0x00, 0x00,
+	// 1465 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcf, 0x6f, 0x1b, 0xc5,
+	0x17, 0xcf, 0xda, 0x8e, 0x63, 0x3f, 0xa7, 0x3f, 0xbe, 0xd3, 0x5f, 0xee, 0xa6, 0x4d, 0xfc, 0x75,
+	0x0a, 0x44, 0x2d, 0xdd, 0x6d, 0x52, 0x0a, 0xfd, 0x01, 0x42, 0x75, 0xd2, 0x4a, 0x39, 0x44, 0xad,
+	0xb6, 0x45, 0x95, 0x40, 0xc8, 0xac, 0x77, 0x27, 0xdb, 0x25, 0xf6, 0x8e, 0xd9, 0x99, 0x4d, 0x13,
+	0x71, 0x02, 0xf1, 0x07, 0xf4, 0xaf, 0xe0, 0xc0, 0x09, 0x09, 0x71, 0x45, 0xe2, 0x56, 0x6e, 0x3d,
+	0x22, 0x21, 0xb5, 0xa8, 0x3d, 0xc0, 0x5f, 0xc0, 0x01, 0x71, 0x40, 0xf3, 0xc3, 0xeb, 0xb5, 0xbd,
+	0x0e, 0xeb, 0xb4, 0xca, 0x29, 0x9e, 0x79, 0x9f, 0x37, 0x33, 0xef, 0xf3, 0x3e, 0x6f, 0xe6, 0x6d,
+	0x60, 0xce, 0xdf, 0x21, 0xa6, 0xd3, 0xb6, 0xfd, 0x0e, 0x35, 0xb7, 0x97, 0x5b, 0x98, 0xd9, 0xcb,
+	0x26, 0xdb, 0x31, 0xba, 0x21, 0x61, 0x04, 0x21, 0x7f, 0x87, 0x18, 0xd2, 0x68, 0x28, 0xa3, 0x7e,
+	0xdc, 0x23, 0x1e, 0x11, 0x66, 0x93, 0xff, 0x92, 0x48, 0x7d, 0xc1, 0x23, 0xc4, 0x6b, 0x63, 0x53,
+	0x8c, 0x5a, 0xd1, 0xa6, 0xc9, 0xfc, 0x0e, 0xa6, 0xcc, 0xee, 0x74, 0x7b, 0x80, 0x94, 0x7d, 0xd4,
+	0xca, 0x12, 0x30, 0xef, 0x10, 0xda, 0x21, 0xd4, 0x6c, 0xd9, 0x14, 0xf7, 0x11, 0xc4, 0x0f, 0x46,
+	0xec, 0xc1, 0x56, 0x6c, 0xe7, 0x03, 0x65, 0x3f, 0xa5, 0xec, 0x1d, 0xea, 0x99, 0xdb, 0xcb, 0xfc,
+	0x8f, 0x34, 0xd4, 0x7f, 0xca, 0xc3, 0xb1, 0x0d, 0xea, 0xad, 0x86, 0xd8, 0x66, 0x78, 0x95, 0xb4,
+	0xdb, 0xd8, 0x61, 0x3e, 0x09, 0xd0, 0x49, 0x28, 0xe2, 0x80, 0xf9, 0x6c, 0xb7, 0xaa, 0xd5, 0xb4,
+	0xa5, 0xb2, 0xa5, 0x46, 0x7c, 0x9e, 0xfa, 0x5e, 0x80, 0xc3, 0x6a, 0x4e, 0xce, 0xcb, 0x11, 0xd2,
+	0xa1, 0x24, 0x16, 0x74, 0x48, 0xbb, 0x9a, 0x17, 0x96, 0x78, 0x8c, 0x3e, 0x04, 0xa0, 0xcc, 0x0e,
+	0x59, 0xd3, 0xb5, 0x19, 0xae, 0x16, 0x6a, 0xda, 0x52, 0x65, 0x45, 0x37, 0x24, 0x27, 0x46, 0x8f,
+	0x13, 0xe3, 0x7e, 0x8f, 0x93, 0x46, 0xe1, 0xf1, 0xf3, 0x05, 0xcd, 0x2a, 0x0b, 0x9f, 0x35, 0x9b,
+	0x61, 0x74, 0x03, 0x4a, 0x38, 0x70, 0xa5, 0xfb, 0x74, 0x46, 0xf7, 0x19, 0x1c, 0xb8, 0xc2, 0xf9,
+	0x38, 0x4c, 0x7f, 0x11, 0x11, 0x66, 0x57, 0x8b, 0x35, 0x6d, 0xa9, 0x60, 0xc9, 0x01, 0xba, 0x06,
+	0xd3, 0x94, 0xf1, 0xf5, 0x66, 0x6a, 0xda, 0xd2, 0xe1, 0x95, 0x45, 0x63, 0x34, 0x99, 0x46, 0x9f,
+	0x8e, 0x7b, 0x1c, 0x6a, 0x49, 0x0f, 0x74, 0x15, 0x4a, 0x5d, 0x7b, 0xb7, 0x83, 0x03, 0x46, 0xab,
+	0x25, 0x71, 0x9a, 0x33, 0x69, 0xde, 0x77, 0x15, 0xc6, 0x8a, 0xd1, 0xe8, 0x16, 0xcc, 0xf8, 0x01,
+	0x13, 0x8e, 0x65, 0xb1, 0xed, 0x85, 0xbd, 0xb7, 0x5d, 0x17, 0xe0, 0x3b, 0x5d, 0xfe, 0x9b, 0x5a,
+	0x3d, 0xdf, 0xeb, 0x95, 0xaf, 0xff, 0xf8, 0xfe, 0xbc, 0x22, 0xbe, 0x7e, 0x16, 0xe6, 0x52, 0xf2,
+	0x67, 0x61, 0xda, 0x25, 0x01, 0xc5, 0xf5, 0xdf, 0xf2, 0x70, 0x78, 0x83, 0x7a, 0xf7, 0xa2, 0x56,
+	0xc7, 0x67, 0xab, 0x7c, 0x23, 0xb4, 0x08, 0x87, 0x9c, 0x18, 0xd8, 0xf4, 0x5d, 0x95, 0xe1, 0xd9,
+	0xfe, 0xe4, 0xba, 0x8b, 0x4e, 0x43, 0x49, 0x1c, 0x8b, 0xdb, 0x65, 0xa6, 0x67, 0xc4, 0x78, 0xdd,
+	0x45, 0x0e, 0x94, 0x6d, 0x0f, 0x07, 0xac, 0xe9, 0xfa, 0xae, 0xcc, 0x75, 0xe3, 0xf6, 0xdf, 0xcf,
+	0x16, 0x1a, 0x9e, 0xcf, 0x1e, 0x46, 0x2d, 0xc3, 0x21, 0x1d, 0xd3, 0xdf, 0x21, 0x9b, 0x24, 0x0a,
+	0x5c, 0x9b, 0xaf, 0xc6, 0x47, 0x17, 0x5b, 0x6d, 0xe2, 0x6c, 0x39, 0x0f, 0x6d, 0x3f, 0x30, 0xb7,
+	0x2f, 0x9b, 0x3b, 0xa6, 0xef, 0xbb, 0x26, 0xdb, 0xed, 0x62, 0x6a, 0xac, 0xad, 0xaf, 0xdd, 0x0e,
+	0x6d, 0x8f, 0x33, 0x64, 0x95, 0xc4, 0xc2, 0x6b, 0xbe, 0xcb, 0x0f, 0x29, 0x37, 0xb1, 0x5d, 0x37,
+	0xc4, 0x94, 0x0a, 0xd9, 0x94, 0xad, 0x59, 0x31, 0x79, 0x53, 0xce, 0x09, 0x90, 0xdb, 0xf1, 0x83,
+	0x18, 0x34, 0xad, 0x40, 0x7c, 0xb2, 0x07, 0x3a, 0x0b, 0x10, 0x51, 0xdc, 0x94, 0xe4, 0x09, 0x11,
+	0x94, 0xac, 0x72, 0x44, 0xb1, 0x24, 0x17, 0x39, 0x50, 0xb4, 0x3b, 0x24, 0x0a, 0x58, 0x75, 0xa6,
+	0x96, 0x5f, 0xaa, 0xac, 0x9c, 0x36, 0x64, 0xa9, 0x18, 0xbc, 0xd4, 0x12, 0x39, 0xf1, 0x83, 0xc6,
+	0xa5, 0x27, 0xcf, 0x16, 0xa6, 0xbe, 0x7b, 0xbe, 0xb0, 0x94, 0x88, 0x54, 0xd5, 0x95, 0xfc, 0x73,
+	0x91, 0xba, 0x5b, 0x2a, 0x2a, 0xee, 0x40, 0x2d, 0xb5, 0x34, 0x6a, 0xc0, 0xac, 0xf3, 0x68, 0xe5,
+	0x52, 0x53, 0x29, 0xa1, 0x5a, 0x12, 0x5b, 0x2d, 0xa4, 0x66, 0xff, 0xc1, 0xca, 0x25, 0x25, 0x1d,
+	0xab, 0xc2, 0x9d, 0xd4, 0xe0, 0x3a, 0xe2, 0x59, 0x1f, 0x8c, 0xb7, 0x5e, 0x85, 0x93, 0x83, 0xc9,
+	0xed, 0xe7, 0xbd, 0x00, 0x47, 0x37, 0xa8, 0x77, 0x6b, 0xdb, 0x6e, 0x47, 0x5c, 0x19, 0x22, 0xf3,
+	0xc9, 0xa4, 0x6a, 0x83, 0x49, 0x1d, 0x11, 0x45, 0x2e, 0x45, 0x14, 0x27, 0xa1, 0x48, 0x42, 0xdb,
+	0x69, 0x63, 0x55, 0xe2, 0x6a, 0x34, 0xa8, 0x88, 0xc2, 0x41, 0x29, 0x62, 0x3a, 0x8b, 0x22, 0x8a,
+	0x29, 0x8a, 0x78, 0x1f, 0x8a, 0xbc, 0x92, 0x23, 0xaa, 0x8a, 0xff, 0x5c, 0x5a, 0x1e, 0x14, 0x73,
+	0xaa, 0xf8, 0x23, 0x6a, 0x29, 0x1f, 0x4e, 0x42, 0x88, 0x6d, 0x4a, 0x02, 0x51, 0xfc, 0x87, 0x2c,
+	0x35, 0x42, 0x17, 0x01, 0x6d, 0xe3, 0xd0, 0xdf, 0xf4, 0x1d, 0xe1, 0xd5, 0xec, 0x86, 0x84, 0x6c,
+	0x8a, 0x3a, 0x2f, 0x5b, 0xff, 0x4b, 0x5a, 0xee, 0x72, 0x43, 0x42, 0x77, 0x70, 0x70, 0xba, 0xab,
+	0xbc, 0x26, 0xdd, 0xe9, 0x50, 0x1d, 0x16, 0x57, 0xac, 0xbc, 0x6f, 0x73, 0x70, 0x64, 0x83, 0x7a,
+	0x6b, 0x3e, 0xed, 0x46, 0x3d, 0xe1, 0x9d, 0x05, 0xa0, 0x51, 0xeb, 0x73, 0xec, 0xb0, 0xbe, 0xf4,
+	0xca, 0x6a, 0x66, 0xf8, 0x46, 0xc9, 0x1d, 0x94, 0x7e, 0xf2, 0x29, 0xfa, 0xf9, 0x3f, 0xcc, 0xba,
+	0xf2, 0xe0, 0x4d, 0xbe, 0x96, 0x10, 0xf3, 0xb4, 0x55, 0x51, 0x73, 0xf7, 0x77, 0xbb, 0x18, 0x5d,
+	0x86, 0x82, 0x6b, 0x33, 0x5b, 0x3d, 0x44, 0xa9, 0x5c, 0xaa, 0xd8, 0xd7, 0x6c, 0x66, 0x5b, 0x02,
+	0xdc, 0x23, 0x31, 0xb9, 0x7f, 0xfd, 0x34, 0x9c, 0x1a, 0xe2, 0x29, 0xe6, 0xf0, 0x97, 0x02, 0xa0,
+	0x0d, 0xea, 0x3d, 0xf0, 0xd9, 0x43, 0x37, 0xb4, 0x1f, 0xa9, 0x54, 0xec, 0x55, 0xbf, 0x57, 0xa1,
+	0xe8, 0x07, 0xdd, 0x88, 0xd1, 0x6a, 0x4e, 0xe4, 0x58, 0xef, 0xcb, 0x29, 0xd8, 0x8a, 0x0f, 0xb6,
+	0xce, 0x21, 0x8d, 0x02, 0xd7, 0x93, 0xa5, 0xf0, 0xe8, 0x06, 0xcc, 0x90, 0x88, 0x09, 0xd7, 0xbc,
+	0x70, 0x9d, 0x4b, 0x75, 0xbd, 0x23, 0x30, 0xca, 0xb7, 0xe7, 0xc1, 0x05, 0xa6, 0xb4, 0xd5, 0xe7,
+	0xeb, 0x70, 0x3a, 0x29, 0x2a, 0x08, 0xce, 0xa1, 0x55, 0xe9, 0xf6, 0x07, 0xe8, 0x13, 0x38, 0xe1,
+	0x90, 0x80, 0x85, 0xb6, 0xc3, 0x9a, 0xcb, 0xcb, 0x57, 0xae, 0xc4, 0x6a, 0x95, 0x0c, 0xbf, 0x95,
+	0xfe, 0x46, 0x4a, 0x07, 0x8e, 0xef, 0xa9, 0xf6, 0x98, 0x33, 0x3a, 0x89, 0xce, 0x40, 0x99, 0x91,
+	0x9b, 0x03, 0x97, 0x41, 0x7f, 0x02, 0xd5, 0xa0, 0xb2, 0x19, 0x92, 0x4e, 0xcf, 0x3e, 0x23, 0xec,
+	0xc9, 0x29, 0xb4, 0x0a, 0xb3, 0x21, 0x6e, 0x63, 0x9b, 0x62, 0xd9, 0x7e, 0x94, 0x32, 0xb6, 0x1f,
+	0x15, 0xe5, 0x25, 0x5a, 0x90, 0x91, 0x5b, 0xa9, 0x9c, 0x72, 0x2b, 0x0d, 0xd7, 0x2a, 0xbc, 0xa6,
+	0x5a, 0x3d, 0x03, 0xfa, 0xa8, 0x94, 0x62, 0xa5, 0xfd, 0xa0, 0x89, 0x52, 0xfe, 0xa8, 0xeb, 0x0e,
+	0xf4, 0x0f, 0xa2, 0xe1, 0xc9, 0xd6, 0x29, 0xc4, 0x9d, 0x54, 0x6e, 0xe2, 0x4e, 0x6a, 0x84, 0x97,
+	0xfc, 0x28, 0x2f, 0xa9, 0x31, 0xd5, 0xa1, 0x36, 0xee, 0xd0, 0x71, 0x64, 0x7f, 0xa5, 0x47, 0xc6,
+	0x13, 0x42, 0xb3, 0x45, 0x36, 0xd8, 0xb7, 0xe6, 0x5e, 0xad, 0x6f, 0xcd, 0x4f, 0xda, 0xb7, 0x8e,
+	0x90, 0x53, 0x78, 0x25, 0x72, 0x44, 0xdc, 0x31, 0x39, 0x3f, 0x6a, 0xa2, 0x6d, 0x1c, 0x06, 0xf5,
+	0x7a, 0xd6, 0x6c, 0xfc, 0x24, 0x1b, 0xe1, 0xdc, 0x44, 0x8d, 0xf0, 0xbe, 0x13, 0xff, 0x06, 0x2c,
+	0xee, 0x71, 0xec, 0x38, 0xbc, 0x9f, 0x35, 0x21, 0xfa, 0x61, 0x9c, 0x6c, 0xf9, 0x32, 0x46, 0x97,
+	0x68, 0xd6, 0x73, 0xfb, 0x6f, 0xd6, 0xf7, 0x1f, 0xea, 0x39, 0xa8, 0x8f, 0x0f, 0x21, 0x8e, 0xf4,
+	0x9f, 0x9c, 0xe8, 0xef, 0xc5, 0xf3, 0x11, 0x77, 0xb4, 0x89, 0xd7, 0x54, 0x3b, 0xa8, 0xd7, 0x34,
+	0x97, 0xde, 0x8d, 0x0d, 0xf2, 0x9c, 0x4f, 0xe1, 0xb9, 0xdf, 0x08, 0x15, 0x0e, 0xae, 0x11, 0x9a,
+	0xde, 0xff, 0xe5, 0x3a, 0xf0, 0x86, 0x33, 0xd1, 0x80, 0x27, 0xd8, 0xef, 0x25, 0x06, 0xcd, 0x41,
+	0x59, 0x4a, 0xa0, 0xaf, 0xaf, 0x92, 0x9c, 0x58, 0x77, 0xd1, 0x07, 0x50, 0xc6, 0x3b, 0x5d, 0x3f,
+	0xc4, 0x4d, 0x9b, 0x65, 0xbe, 0x58, 0x4a, 0xd2, 0xe5, 0x26, 0x5b, 0xf9, 0xb3, 0x04, 0xf9, 0x0d,
+	0xea, 0xa1, 0x36, 0x1c, 0x1d, 0xf9, 0x70, 0x4f, 0x7d, 0x2e, 0x53, 0xbe, 0x10, 0x75, 0x33, 0x23,
+	0x30, 0x8e, 0xe8, 0x53, 0xa8, 0x24, 0x3f, 0x23, 0xeb, 0x63, 0xfc, 0x13, 0x18, 0xfd, 0xfc, 0x7f,
+	0x63, 0xe2, 0xe5, 0x1d, 0x38, 0x34, 0xf8, 0xb5, 0x72, 0x6e, 0x8c, 0xf3, 0x00, 0x4a, 0x7f, 0x3b,
+	0x0b, 0x2a, 0xde, 0xe4, 0x33, 0x98, 0x1d, 0x68, 0x4c, 0x17, 0xc7, 0x78, 0x27, 0x41, 0xfa, 0x85,
+	0x0c, 0xa0, 0x78, 0x07, 0x1f, 0x8e, 0x0c, 0xb7, 0x6d, 0x6f, 0x8e, 0xf1, 0x1f, 0xc2, 0xe9, 0x46,
+	0x36, 0x5c, 0xbc, 0xd5, 0x97, 0x70, 0x22, 0xfd, 0xdd, 0x1e, 0xc7, 0x49, 0x2a, 0x5a, 0x7f, 0x67,
+	0x12, 0xf4, 0x5e, 0x9b, 0xcb, 0xa7, 0x35, 0xeb, 0xe6, 0x02, 0x9d, 0x79, 0xf3, 0x81, 0xe7, 0x0b,
+	0x7d, 0xa3, 0x41, 0x75, 0xec, 0xdb, 0x65, 0x66, 0x5c, 0xb2, 0xe7, 0xa0, 0xbf, 0x37, 0xa1, 0x43,
+	0x7c, 0x8c, 0xaf, 0x34, 0x38, 0x35, 0xee, 0x8d, 0x31, 0x32, 0x2e, 0xaa, 0xf0, 0xfa, 0xbb, 0x93,
+	0xe1, 0x93, 0x55, 0x99, 0xbc, 0xfc, 0xc7, 0x55, 0x65, 0x02, 0x33, 0xb6, 0x2a, 0x53, 0xae, 0xb1,
+	0xc6, 0xbd, 0x27, 0x2f, 0xe6, 0xb5, 0xa7, 0x2f, 0xe6, 0xb5, 0xdf, 0x5f, 0xcc, 0x6b, 0x8f, 0x5f,
+	0xce, 0x4f, 0x3d, 0x7d, 0x39, 0x3f, 0xf5, 0xeb, 0xcb, 0xf9, 0xa9, 0x8f, 0xaf, 0x4d, 0xf4, 0x9e,
+	0xa8, 0x7f, 0x6e, 0x8a, 0xbb, 0xb9, 0x55, 0x14, 0x77, 0xdc, 0xe5, 0x7f, 0x03, 0x00, 0x00, 0xff,
+	0xff, 0xc4, 0xd8, 0x77, 0x26, 0x5f, 0x15, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1190,6 +1488,8 @@ type MsgClient interface {
 	UpdateCollectionState(ctx context.Context, in *MsgUpdateCollectionState, opts ...grpc.CallOption) (*MsgUpdateCollectionStateResponse, error)
 	UpdateCollectionDates(ctx context.Context, in *MsgUpdateCollectionDates, opts ...grpc.CallOption) (*MsgUpdateCollectionDatesResponse, error)
 	UpdateCollectionPayments(ctx context.Context, in *MsgUpdateCollectionPayments, opts ...grpc.CallOption) (*MsgUpdateCollectionPaymentsResponse, error)
+	UpdateCollectionIntents(ctx context.Context, in *MsgUpdateCollectionIntents, opts ...grpc.CallOption) (*MsgUpdateCollectionIntentsResponse, error)
+	ClaimIntent(ctx context.Context, in *MsgClaimIntent, opts ...grpc.CallOption) (*MsgClaimIntentResponse, error)
 }
 
 type msgClient struct {
@@ -1272,6 +1572,24 @@ func (c *msgClient) UpdateCollectionPayments(ctx context.Context, in *MsgUpdateC
 	return out, nil
 }
 
+func (c *msgClient) UpdateCollectionIntents(ctx context.Context, in *MsgUpdateCollectionIntents, opts ...grpc.CallOption) (*MsgUpdateCollectionIntentsResponse, error) {
+	out := new(MsgUpdateCollectionIntentsResponse)
+	err := c.cc.Invoke(ctx, "/ixo.claims.v1beta1.Msg/UpdateCollectionIntents", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *msgClient) ClaimIntent(ctx context.Context, in *MsgClaimIntent, opts ...grpc.CallOption) (*MsgClaimIntentResponse, error) {
+	out := new(MsgClaimIntentResponse)
+	err := c.cc.Invoke(ctx, "/ixo.claims.v1beta1.Msg/ClaimIntent", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // MsgServer is the server API for Msg service.
 type MsgServer interface {
 	CreateCollection(context.Context, *MsgCreateCollection) (*MsgCreateCollectionResponse, error)
@@ -1282,6 +1600,8 @@ type MsgServer interface {
 	UpdateCollectionState(context.Context, *MsgUpdateCollectionState) (*MsgUpdateCollectionStateResponse, error)
 	UpdateCollectionDates(context.Context, *MsgUpdateCollectionDates) (*MsgUpdateCollectionDatesResponse, error)
 	UpdateCollectionPayments(context.Context, *MsgUpdateCollectionPayments) (*MsgUpdateCollectionPaymentsResponse, error)
+	UpdateCollectionIntents(context.Context, *MsgUpdateCollectionIntents) (*MsgUpdateCollectionIntentsResponse, error)
+	ClaimIntent(context.Context, *MsgClaimIntent) (*MsgClaimIntentResponse, error)
 }
 
 // UnimplementedMsgServer can be embedded to have forward compatible implementations.
@@ -1312,6 +1632,12 @@ func (*UnimplementedMsgServer) UpdateCollectionDates(ctx context.Context, req *M
 func (*UnimplementedMsgServer) UpdateCollectionPayments(ctx context.Context, req *MsgUpdateCollectionPayments) (*MsgUpdateCollectionPaymentsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateCollectionPayments not implemented")
 }
+func (*UnimplementedMsgServer) UpdateCollectionIntents(ctx context.Context, req *MsgUpdateCollectionIntents) (*MsgUpdateCollectionIntentsResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UpdateCollectionIntents not implemented")
+}
+func (*UnimplementedMsgServer) ClaimIntent(ctx context.Context, req *MsgClaimIntent) (*MsgClaimIntentResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ClaimIntent not implemented")
+}
 
 func RegisterMsgServer(s grpc1.Server, srv MsgServer) {
 	s.RegisterService(&_Msg_serviceDesc, srv)
@@ -1461,6 +1787,42 @@ func _Msg_UpdateCollectionPayments_Handler(srv interface{}, ctx context.Context,
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Msg_UpdateCollectionIntents_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgUpdateCollectionIntents)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(MsgServer).UpdateCollectionIntents(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/ixo.claims.v1beta1.Msg/UpdateCollectionIntents",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(MsgServer).UpdateCollectionIntents(ctx, req.(*MsgUpdateCollectionIntents))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Msg_ClaimIntent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgClaimIntent)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(MsgServer).ClaimIntent(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/ixo.claims.v1beta1.Msg/ClaimIntent",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(MsgServer).ClaimIntent(ctx, req.(*MsgClaimIntent))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _Msg_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "ixo.claims.v1beta1.Msg",
 	HandlerType: (*MsgServer)(nil),
@@ -1497,6 +1859,14 @@ var _Msg_serviceDesc = grpc.ServiceDesc{
 			MethodName: "UpdateCollectionPayments",
 			Handler:    _Msg_UpdateCollectionPayments_Handler,
 		},
+		{
+			MethodName: "UpdateCollectionIntents",
+			Handler:    _Msg_UpdateCollectionIntents_Handler,
+		},
+		{
+			MethodName: "ClaimIntent",
+			Handler:    _Msg_ClaimIntent_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "ixo/claims/v1beta1/tx.proto",
@@ -1522,6 +1892,11 @@ func (m *MsgCreateCollection) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	if m.Intents != 0 {
+		i = encodeVarintTx(dAtA, i, uint64(m.Intents))
+		i--
+		dAtA[i] = 0x48
+	}
 	if m.Payments != nil {
 		{
 			size, err := m.Payments.MarshalToSizedBuffer(dAtA[:i])
@@ -1631,6 +2006,44 @@ func (m *MsgSubmitClaim) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	if len(m.Cw20Payment) > 0 {
+		for iNdEx := len(m.Cw20Payment) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.Cw20Payment[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintTx(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x42
+		}
+	}
+	if len(m.Amount) > 0 {
+		for iNdEx := len(m.Amount) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.Amount[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintTx(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x3a
+		}
+	}
+	if m.UseIntent {
+		i--
+		if m.UseIntent {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x30
+	}
 	if len(m.AdminAddress) > 0 {
 		i -= len(m.AdminAddress)
 		copy(dAtA[i:], m.AdminAddress)
@@ -2269,16 +2682,193 @@ func (m *MsgUpdateCollectionPaymentsResponse) MarshalToSizedBuffer(dAtA []byte)
 	return len(dAtA) - i, nil
 }
 
-func encodeVarintTx(dAtA []byte, offset int, v uint64) int {
-	offset -= sovTx(v)
-	base := offset
-	for v >= 1<<7 {
-		dAtA[offset] = uint8(v&0x7f | 0x80)
-		v >>= 7
-		offset++
+func (m *MsgUpdateCollectionIntents) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
 	}
-	dAtA[offset] = uint8(v)
-	return base
+	return dAtA[:n], nil
+}
+
+func (m *MsgUpdateCollectionIntents) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *MsgUpdateCollectionIntents) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.AdminAddress) > 0 {
+		i -= len(m.AdminAddress)
+		copy(dAtA[i:], m.AdminAddress)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.AdminAddress)))
+		i--
+		dAtA[i] = 0x1a
+	}
+	if m.Intents != 0 {
+		i = encodeVarintTx(dAtA, i, uint64(m.Intents))
+		i--
+		dAtA[i] = 0x10
+	}
+	if len(m.CollectionId) > 0 {
+		i -= len(m.CollectionId)
+		copy(dAtA[i:], m.CollectionId)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.CollectionId)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *MsgUpdateCollectionIntentsResponse) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *MsgUpdateCollectionIntentsResponse) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *MsgUpdateCollectionIntentsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	return len(dAtA) - i, nil
+}
+
+func (m *MsgClaimIntent) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *MsgClaimIntent) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *MsgClaimIntent) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.Cw20Payment) > 0 {
+		for iNdEx := len(m.Cw20Payment) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.Cw20Payment[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintTx(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x2a
+		}
+	}
+	if len(m.Amount) > 0 {
+		for iNdEx := len(m.Amount) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.Amount[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintTx(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x22
+		}
+	}
+	if len(m.CollectionId) > 0 {
+		i -= len(m.CollectionId)
+		copy(dAtA[i:], m.CollectionId)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.CollectionId)))
+		i--
+		dAtA[i] = 0x1a
+	}
+	if len(m.AgentAddress) > 0 {
+		i -= len(m.AgentAddress)
+		copy(dAtA[i:], m.AgentAddress)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.AgentAddress)))
+		i--
+		dAtA[i] = 0x12
+	}
+	if len(m.AgentDid) > 0 {
+		i -= len(m.AgentDid)
+		copy(dAtA[i:], m.AgentDid)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.AgentDid)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *MsgClaimIntentResponse) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *MsgClaimIntentResponse) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *MsgClaimIntentResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.ExpireAt != nil {
+		n10, err10 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(*m.ExpireAt, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.ExpireAt):])
+		if err10 != nil {
+			return 0, err10
+		}
+		i -= n10
+		i = encodeVarintTx(dAtA, i, uint64(n10))
+		i--
+		dAtA[i] = 0x12
+	}
+	if len(m.IntentId) > 0 {
+		i -= len(m.IntentId)
+		copy(dAtA[i:], m.IntentId)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.IntentId)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func encodeVarintTx(dAtA []byte, offset int, v uint64) int {
+	offset -= sovTx(v)
+	base := offset
+	for v >= 1<<7 {
+		dAtA[offset] = uint8(v&0x7f | 0x80)
+		v >>= 7
+		offset++
+	}
+	dAtA[offset] = uint8(v)
+	return base
 }
 func (m *MsgCreateCollection) Size() (n int) {
 	if m == nil {
@@ -2316,6 +2906,9 @@ func (m *MsgCreateCollection) Size() (n int) {
 		l = m.Payments.Size()
 		n += 1 + l + sovTx(uint64(l))
 	}
+	if m.Intents != 0 {
+		n += 1 + sovTx(uint64(m.Intents))
+	}
 	return n
 }
 
@@ -2354,6 +2947,21 @@ func (m *MsgSubmitClaim) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovTx(uint64(l))
 	}
+	if m.UseIntent {
+		n += 2
+	}
+	if len(m.Amount) > 0 {
+		for _, e := range m.Amount {
+			l = e.Size()
+			n += 1 + l + sovTx(uint64(l))
+		}
+	}
+	if len(m.Cw20Payment) > 0 {
+		for _, e := range m.Cw20Payment {
+			l = e.Size()
+			n += 1 + l + sovTx(uint64(l))
+		}
+	}
 	return n
 }
 
@@ -2623,6 +3231,85 @@ func (m *MsgUpdateCollectionPaymentsResponse) Size() (n int) {
 	return n
 }
 
+func (m *MsgUpdateCollectionIntents) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.CollectionId)
+	if l > 0 {
+		n += 1 + l + sovTx(uint64(l))
+	}
+	if m.Intents != 0 {
+		n += 1 + sovTx(uint64(m.Intents))
+	}
+	l = len(m.AdminAddress)
+	if l > 0 {
+		n += 1 + l + sovTx(uint64(l))
+	}
+	return n
+}
+
+func (m *MsgUpdateCollectionIntentsResponse) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	return n
+}
+
+func (m *MsgClaimIntent) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.AgentDid)
+	if l > 0 {
+		n += 1 + l + sovTx(uint64(l))
+	}
+	l = len(m.AgentAddress)
+	if l > 0 {
+		n += 1 + l + sovTx(uint64(l))
+	}
+	l = len(m.CollectionId)
+	if l > 0 {
+		n += 1 + l + sovTx(uint64(l))
+	}
+	if len(m.Amount) > 0 {
+		for _, e := range m.Amount {
+			l = e.Size()
+			n += 1 + l + sovTx(uint64(l))
+		}
+	}
+	if len(m.Cw20Payment) > 0 {
+		for _, e := range m.Cw20Payment {
+			l = e.Size()
+			n += 1 + l + sovTx(uint64(l))
+		}
+	}
+	return n
+}
+
+func (m *MsgClaimIntentResponse) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.IntentId)
+	if l > 0 {
+		n += 1 + l + sovTx(uint64(l))
+	}
+	if m.ExpireAt != nil {
+		l = github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.ExpireAt)
+		n += 1 + l + sovTx(uint64(l))
+	}
+	return n
+}
+
 func sovTx(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
@@ -2900,6 +3587,25 @@ func (m *MsgCreateCollection) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
+		case 9:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Intents", wireType)
+			}
+			m.Intents = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Intents |= CollectionIntentOptions(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
 		default:
 			iNdEx = preIndex
 			skippy, err := skipTx(dAtA[iNdEx:])
@@ -3160,8 +3866,96 @@ func (m *MsgSubmitClaim) Unmarshal(dAtA []byte) error {
 			}
 			m.AdminAddress = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
+		case 6:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field UseIntent", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.UseIntent = bool(v != 0)
+		case 7:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Amount = append(m.Amount, types.Coin{})
+			if err := m.Amount[len(m.Amount)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 8:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Cw20Payment", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Cw20Payment = append(m.Cw20Payment, &CW20Payment{})
+			if err := m.Cw20Payment[len(m.Cw20Payment)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
 			skippy, err := skipTx(dAtA[iNdEx:])
 			if err != nil {
 				return err
@@ -4952,6 +5746,521 @@ func (m *MsgUpdateCollectionPaymentsResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *MsgUpdateCollectionIntents) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowTx
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MsgUpdateCollectionIntents: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MsgUpdateCollectionIntents: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field CollectionId", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.CollectionId = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Intents", wireType)
+			}
+			m.Intents = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Intents |= CollectionIntentOptions(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field AdminAddress", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.AdminAddress = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipTx(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthTx
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *MsgUpdateCollectionIntentsResponse) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowTx
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MsgUpdateCollectionIntentsResponse: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MsgUpdateCollectionIntentsResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		default:
+			iNdEx = preIndex
+			skippy, err := skipTx(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthTx
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *MsgClaimIntent) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowTx
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MsgClaimIntent: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MsgClaimIntent: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field AgentDid", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.AgentDid = github_com_ixofoundation_ixo_blockchain_v3_x_iid_types.DIDFragment(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field AgentAddress", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.AgentAddress = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field CollectionId", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.CollectionId = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Amount = append(m.Amount, types.Coin{})
+			if err := m.Amount[len(m.Amount)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 5:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Cw20Payment", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Cw20Payment = append(m.Cw20Payment, &CW20Payment{})
+			if err := m.Cw20Payment[len(m.Cw20Payment)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipTx(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthTx
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *MsgClaimIntentResponse) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowTx
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MsgClaimIntentResponse: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MsgClaimIntentResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field IntentId", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.IntentId = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ExpireAt", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.ExpireAt == nil {
+				m.ExpireAt = new(time.Time)
+			}
+			if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(m.ExpireAt, dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipTx(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthTx
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func skipTx(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0