diff --git a/contracts/gateway/src/contract.rs b/contracts/gateway/src/contract.rs
index ebde2b2fe..e40799767 100644
--- a/contracts/gateway/src/contract.rs
+++ b/contracts/gateway/src/contract.rs
@@ -6,9 +6,11 @@ use cosmwasm_std::{Binary, Deps, DepsMut, Empty, Env, MessageInfo, Response};
 use gateway_api::msg::{ExecuteMsg, QueryMsg};
 use router_api::CrossChainId;
 
+use crate::contract::migrations::v0_2_3;
 use crate::msg::InstantiateMsg;
 
 mod execute;
+mod migrations;
 mod query;
 
 const CONTRACT_NAME: &str = env!("CARGO_PKG_NAME");
@@ -20,10 +22,7 @@ pub fn migrate(
     _env: Env,
     _msg: Empty,
 ) -> Result<Response, axelar_wasm_std::error::ContractError> {
-    // any version checks should be done before here
-
-    cw2::set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
-
+    v0_2_3::migrate(deps.storage)?;
     Ok(Response::default())
 }
 
@@ -147,21 +146,3 @@ mod internal {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use cosmwasm_std::testing::{mock_dependencies, mock_env};
-
-    use super::*;
-
-    #[test]
-    fn migrate_sets_contract_version() {
-        let mut deps = mock_dependencies();
-
-        migrate(deps.as_mut(), mock_env(), Empty {}).unwrap();
-
-        let contract_version = cw2::get_contract_version(deps.as_mut().storage).unwrap();
-        assert_eq!(contract_version.contract, "gateway");
-        assert_eq!(contract_version.version, CONTRACT_VERSION);
-    }
-}
diff --git a/contracts/gateway/src/contract/execute.rs b/contracts/gateway/src/contract/execute.rs
index 78586a14e..d50b8aa40 100644
--- a/contracts/gateway/src/contract/execute.rs
+++ b/contracts/gateway/src/contract/execute.rs
@@ -37,7 +37,8 @@ pub(crate) fn route_outgoing_messages(
     let msgs = check_for_duplicates(verified)?;
 
     for msg in msgs.iter() {
-        state::save_outgoing_msg(store, &msg.cc_id, msg)
+        state::OUTGOING_MESSAGES
+            .save(store, &msg.cc_id, msg)
             .change_context(Error::InvalidStoreAccess)?;
     }
 
diff --git a/contracts/gateway/src/contract/migrations/mod.rs b/contracts/gateway/src/contract/migrations/mod.rs
new file mode 100644
index 000000000..3f8ffb3bd
--- /dev/null
+++ b/contracts/gateway/src/contract/migrations/mod.rs
@@ -0,0 +1 @@
+pub mod v0_2_3;
diff --git a/contracts/gateway/src/contract/migrations/v0_2_3.rs b/contracts/gateway/src/contract/migrations/v0_2_3.rs
new file mode 100644
index 000000000..a05fe95ea
--- /dev/null
+++ b/contracts/gateway/src/contract/migrations/v0_2_3.rs
@@ -0,0 +1,185 @@
+#![allow(deprecated)]
+
+use std::any::type_name;
+
+use axelar_wasm_std::error::ContractError;
+use axelar_wasm_std::nonempty;
+use cosmwasm_schema::cw_serde;
+use cosmwasm_std::{StdError, StdResult, Storage};
+use cw_storage_plus::{Key, KeyDeserialize, Map, PrimaryKey};
+use router_api::{Address, ChainName, ChainNameRaw};
+
+use crate::contract::{CONTRACT_NAME, CONTRACT_VERSION};
+
+const BASE_VERSION: &str = "0.2.3";
+
+pub fn migrate(storage: &mut dyn Storage) -> Result<(), ContractError> {
+    cw2::assert_contract_version(storage, CONTRACT_NAME, BASE_VERSION)?;
+
+    delete_outgoing_messages(storage);
+
+    cw2::set_contract_version(storage, CONTRACT_NAME, CONTRACT_VERSION)?;
+
+    Ok(())
+}
+
+fn delete_outgoing_messages(storage: &mut dyn Storage) {
+    OUTGOING_MESSAGES.clear(storage);
+}
+
+#[deprecated(since = "0.2.3", note = "only used during migration")]
+const OUTGOING_MESSAGES_NAME: &str = "outgoing_messages";
+
+#[deprecated(since = "0.2.3", note = "only used during migration")]
+const OUTGOING_MESSAGES: Map<&CrossChainId, Message> = Map::new(OUTGOING_MESSAGES_NAME);
+
+#[cw_serde]
+#[derive(Eq, Hash)]
+#[deprecated(since = "0.2.3", note = "only used during migration")]
+pub struct Message {
+    pub cc_id: CrossChainId,
+    pub source_address: Address,
+    pub destination_chain: ChainName,
+    pub destination_address: Address,
+    /// for better user experience, the payload hash gets encoded into hex at the edges (input/output),
+    /// but internally, we treat it as raw bytes to enforce its format.
+    #[serde(with = "axelar_wasm_std::hex")]
+    #[schemars(with = "String")] // necessary attribute in conjunction with #[serde(with ...)]
+    pub payload_hash: [u8; 32],
+}
+
+#[cw_serde]
+#[derive(Eq, Hash)]
+#[deprecated(since = "0.2.3", note = "only used during migration")]
+pub struct CrossChainId {
+    pub chain: ChainNameRaw,
+    pub id: nonempty::String,
+}
+
+impl PrimaryKey<'_> for CrossChainId {
+    type Prefix = ChainNameRaw;
+    type SubPrefix = ();
+    type Suffix = String;
+    type SuperSuffix = (ChainNameRaw, String);
+
+    fn key(&self) -> Vec<Key> {
+        let mut keys = self.chain.key();
+        keys.extend(self.id.key());
+        keys
+    }
+}
+
+impl KeyDeserialize for &CrossChainId {
+    type Output = CrossChainId;
+
+    fn from_vec(value: Vec<u8>) -> StdResult<Self::Output> {
+        let (chain, id) = <(ChainNameRaw, String)>::from_vec(value)?;
+        Ok(CrossChainId {
+            chain,
+            id: id
+                .try_into()
+                .map_err(|err| StdError::parse_err(type_name::<nonempty::String>(), err))?,
+        })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
+    use cosmwasm_std::DepsMut;
+
+    use crate::contract::migrations::v0_2_3;
+    use crate::contract::{instantiate, CONTRACT_NAME, CONTRACT_VERSION};
+    use crate::msg::InstantiateMsg;
+    use crate::state;
+
+    #[test]
+    fn migrate_checks_contract_version() {
+        let mut deps = mock_dependencies();
+        instantiate_contract(deps.as_mut());
+
+        cw2::set_contract_version(deps.as_mut().storage, CONTRACT_NAME, "something wrong").unwrap();
+
+        assert!(v0_2_3::migrate(deps.as_mut().storage).is_err());
+
+        cw2::set_contract_version(deps.as_mut().storage, CONTRACT_NAME, v0_2_3::BASE_VERSION)
+            .unwrap();
+
+        assert!(v0_2_3::migrate(deps.as_mut().storage).is_ok());
+    }
+
+    #[test]
+    fn migrate_sets_contract_version() {
+        let mut deps = mock_dependencies();
+        instantiate_contract(deps.as_mut());
+
+        v0_2_3::migrate(deps.as_mut().storage).unwrap();
+
+        let contract_version = cw2::get_contract_version(deps.as_mut().storage).unwrap();
+        assert_eq!(contract_version.contract, CONTRACT_NAME);
+        assert_eq!(contract_version.version, CONTRACT_VERSION);
+    }
+
+    fn instantiate_contract(deps: DepsMut) {
+        instantiate(
+            deps,
+            mock_env(),
+            mock_info("admin", &[]),
+            InstantiateMsg {
+                verifier_address: "verifier".to_string(),
+                router_address: "router".to_string(),
+            },
+        )
+        .unwrap();
+    }
+
+    #[test]
+    fn migrate_outgoing_messages() {
+        let mut deps = mock_dependencies();
+
+        instantiate_contract(deps.as_mut());
+
+        let msgs = vec![
+            v0_2_3::Message {
+                cc_id: v0_2_3::CrossChainId {
+                    id: "id1".try_into().unwrap(),
+                    chain: "chain1".try_into().unwrap(),
+                },
+                source_address: "source-address".parse().unwrap(),
+                destination_chain: "destination".parse().unwrap(),
+                destination_address: "destination-address".parse().unwrap(),
+                payload_hash: [1; 32],
+            },
+            v0_2_3::Message {
+                cc_id: v0_2_3::CrossChainId {
+                    id: "id2".try_into().unwrap(),
+                    chain: "chain2".try_into().unwrap(),
+                },
+                source_address: "source-address2".parse().unwrap(),
+                destination_chain: "destination2".parse().unwrap(),
+                destination_address: "destination-address2".parse().unwrap(),
+                payload_hash: [2; 32],
+            },
+            v0_2_3::Message {
+                cc_id: v0_2_3::CrossChainId {
+                    id: "id3".try_into().unwrap(),
+                    chain: "chain3".try_into().unwrap(),
+                },
+                source_address: "source-address3".parse().unwrap(),
+                destination_chain: "destination3".parse().unwrap(),
+                destination_address: "destination-address3".parse().unwrap(),
+                payload_hash: [3; 32],
+            },
+        ];
+
+        for msg in msgs.iter() {
+            v0_2_3::OUTGOING_MESSAGES
+                .save(deps.as_mut().storage, &msg.cc_id, msg)
+                .unwrap();
+        }
+
+        assert!(v0_2_3::migrate(deps.as_mut().storage).is_ok());
+
+        assert!(state::OUTGOING_MESSAGES.is_empty(deps.as_ref().storage))
+    }
+}
diff --git a/contracts/gateway/src/contract/query.rs b/contracts/gateway/src/contract/query.rs
index 62835b162..d29eefa9c 100644
--- a/contracts/gateway/src/contract/query.rs
+++ b/contracts/gateway/src/contract/query.rs
@@ -17,7 +17,8 @@ pub fn outgoing_messages(
 }
 
 fn try_load_msg(storage: &dyn Storage, id: CrossChainId) -> Result<Message, Error> {
-    state::may_load_outgoing_msg(storage, &id)
+    state::OUTGOING_MESSAGES
+        .may_load(storage, &id)
         .change_context(Error::InvalidStoreAccess)
         .transpose()
         .unwrap_or(Err(report!(Error::MessageNotFound(id))))
@@ -51,7 +52,9 @@ mod test {
         let messages = generate_messages();
 
         for message in messages.iter() {
-            state::save_outgoing_msg(deps.as_mut().storage, &message.cc_id, message).unwrap();
+            state::OUTGOING_MESSAGES
+                .save(deps.as_mut().storage, &message.cc_id, message)
+                .unwrap();
         }
 
         let ids = messages.iter().map(|msg| msg.cc_id.clone()).collect();
@@ -79,7 +82,9 @@ mod test {
 
         let messages = generate_messages();
 
-        state::save_outgoing_msg(deps.as_mut().storage, &messages[1].cc_id, &messages[1]).unwrap();
+        state::OUTGOING_MESSAGES
+            .save(deps.as_mut().storage, &messages[1].cc_id, &messages[1])
+            .unwrap();
 
         let ids = messages.iter().map(|msg| msg.cc_id.clone()).collect();
 
diff --git a/contracts/gateway/src/state.rs b/contracts/gateway/src/state.rs
index 161ebc1a3..473cb7ba5 100644
--- a/contracts/gateway/src/state.rs
+++ b/contracts/gateway/src/state.rs
@@ -21,39 +21,18 @@ pub(crate) fn load_config(storage: &dyn Storage) -> Result<Config, Error> {
         .change_context(Error::LoadValue(CONFIG_NAME))
 }
 
-pub(crate) fn save_outgoing_msg(
-    storage: &mut dyn Storage,
-    key: &CrossChainId,
-    value: &Message,
-) -> Result<(), Error> {
-    OUTGOING_MESSAGES
-        .save(storage, key, value)
-        .change_context(Error::SaveValue(OUTGOING_MESSAGES_NAME))
-}
-pub(crate) fn may_load_outgoing_msg(
-    storage: &dyn Storage,
-    id: &CrossChainId,
-) -> Result<Option<Message>, Error> {
-    OUTGOING_MESSAGES
-        .may_load(storage, id)
-        .change_context(Error::Parse(OUTGOING_MESSAGES_NAME))
-        .attach_printable(id.to_string())
-}
-
 #[derive(thiserror::Error, Debug)]
 pub(crate) enum Error {
     #[error("failed to save {0}")]
     SaveValue(&'static str),
     #[error("failed to load {0}")]
     LoadValue(&'static str),
-    #[error("failed to parse key for {0}")]
-    Parse(&'static str),
 }
 
 const CONFIG_NAME: &str = "config";
 const CONFIG: Item<Config> = Item::new(CONFIG_NAME);
 const OUTGOING_MESSAGES_NAME: &str = "outgoing_messages";
-const OUTGOING_MESSAGES: Map<&CrossChainId, Message> = Map::new(OUTGOING_MESSAGES_NAME);
+pub const OUTGOING_MESSAGES: Map<&CrossChainId, Message> = Map::new(OUTGOING_MESSAGES_NAME);
 
 #[cfg(test)]
 mod test {
@@ -61,9 +40,7 @@ mod test {
     use cosmwasm_std::Addr;
     use router_api::{CrossChainId, Message};
 
-    use crate::state::{
-        load_config, may_load_outgoing_msg, save_config, save_outgoing_msg, Config,
-    };
+    use crate::state::{load_config, save_config, Config, OUTGOING_MESSAGES};
 
     #[test]
     fn config_storage() {
@@ -90,23 +67,31 @@ mod test {
             payload_hash: [1; 32],
         };
 
-        assert!(save_outgoing_msg(deps.as_mut().storage, &message.cc_id, &message).is_ok());
+        assert!(OUTGOING_MESSAGES
+            .save(deps.as_mut().storage, &message.cc_id, &message)
+            .is_ok());
 
         assert_eq!(
-            may_load_outgoing_msg(&deps.storage, &message.cc_id).unwrap(),
+            OUTGOING_MESSAGES
+                .may_load(&deps.storage, &message.cc_id)
+                .unwrap(),
             Some(message)
         );
 
         let unknown_chain_id = CrossChainId::new("unknown", "id").unwrap();
 
         assert_eq!(
-            may_load_outgoing_msg(&deps.storage, &unknown_chain_id).unwrap(),
+            OUTGOING_MESSAGES
+                .may_load(&deps.storage, &unknown_chain_id)
+                .unwrap(),
             None
         );
 
         let unknown_id = CrossChainId::new("chain", "unkown").unwrap();
         assert_eq!(
-            may_load_outgoing_msg(&deps.storage, &unknown_id).unwrap(),
+            OUTGOING_MESSAGES
+                .may_load(&deps.storage, &unknown_id)
+                .unwrap(),
             None
         );
     }
diff --git a/contracts/gateway/tests/test_route_incoming.json b/contracts/gateway/tests/test_route_incoming.json
index b8bb48025..f0b261d23 100644
--- a/contracts/gateway/tests/test_route_incoming.json
+++ b/contracts/gateway/tests/test_route_incoming.json
@@ -13,7 +13,7 @@
           "wasm": {
             "execute": {
               "contract_addr": "router",
-              "msg": "eyJyb3V0ZV9tZXNzYWdlcyI6W3siY2NfaWQiOnsiY2hhaW4iOiJtb2NrLWNoYWluIiwiaWQiOiJTdWNjZWVkZWRPblNvdXJjZUNoYWluMCJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAifV19",
+              "msg": "eyJyb3V0ZV9tZXNzYWdlcyI6W3siY2NfaWQiOnsic291cmNlX2NoYWluIjoibW9jay1jaGFpbiIsIm1lc3NhZ2VfaWQiOiJTdWNjZWVkZWRPblNvdXJjZUNoYWluMCJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAifV19",
               "funds": []
             }
           }
@@ -28,7 +28,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain0"
           },
           {
@@ -64,7 +64,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain0"
           },
           {
@@ -100,7 +100,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain0"
           },
           {
@@ -136,7 +136,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify0"
           },
           {
@@ -172,7 +172,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress0"
           },
           {
@@ -208,7 +208,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown0"
           },
           {
@@ -244,7 +244,7 @@
           "wasm": {
             "execute": {
               "contract_addr": "router",
-              "msg": "eyJyb3V0ZV9tZXNzYWdlcyI6W3siY2NfaWQiOnsiY2hhaW4iOiJtb2NrLWNoYWluIiwiaWQiOiJTdWNjZWVkZWRPblNvdXJjZUNoYWluMCJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiU3VjY2VlZGVkT25Tb3VyY2VDaGFpbjEifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxIn0seyJjY19pZCI6eyJjaGFpbiI6Im1vY2stY2hhaW4iLCJpZCI6IlN1Y2NlZWRlZE9uU291cmNlQ2hhaW4yIn0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMiJ9LHsiY2NfaWQiOnsiY2hhaW4iOiJtb2NrLWNoYWluIiwiaWQiOiJTdWNjZWVkZWRPblNvdXJjZUNoYWluMyJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiU3VjY2VlZGVkT25Tb3VyY2VDaGFpbjQifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0In0seyJjY19pZCI6eyJjaGFpbiI6Im1vY2stY2hhaW4iLCJpZCI6IlN1Y2NlZWRlZE9uU291cmNlQ2hhaW41In0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNSJ9LHsiY2NfaWQiOnsiY2hhaW4iOiJtb2NrLWNoYWluIiwiaWQiOiJTdWNjZWVkZWRPblNvdXJjZUNoYWluNiJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiU3VjY2VlZGVkT25Tb3VyY2VDaGFpbjcifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3In0seyJjY19pZCI6eyJjaGFpbiI6Im1vY2stY2hhaW4iLCJpZCI6IlN1Y2NlZWRlZE9uU291cmNlQ2hhaW44In0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwOCJ9LHsiY2NfaWQiOnsiY2hhaW4iOiJtb2NrLWNoYWluIiwiaWQiOiJTdWNjZWVkZWRPblNvdXJjZUNoYWluOSJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkifV19",
+              "msg": "eyJyb3V0ZV9tZXNzYWdlcyI6W3siY2NfaWQiOnsic291cmNlX2NoYWluIjoibW9jay1jaGFpbiIsIm1lc3NhZ2VfaWQiOiJTdWNjZWVkZWRPblNvdXJjZUNoYWluMCJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiU3VjY2VlZGVkT25Tb3VyY2VDaGFpbjEifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxIn0seyJjY19pZCI6eyJzb3VyY2VfY2hhaW4iOiJtb2NrLWNoYWluIiwibWVzc2FnZV9pZCI6IlN1Y2NlZWRlZE9uU291cmNlQ2hhaW4yIn0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMiJ9LHsiY2NfaWQiOnsic291cmNlX2NoYWluIjoibW9jay1jaGFpbiIsIm1lc3NhZ2VfaWQiOiJTdWNjZWVkZWRPblNvdXJjZUNoYWluMyJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiU3VjY2VlZGVkT25Tb3VyY2VDaGFpbjQifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0In0seyJjY19pZCI6eyJzb3VyY2VfY2hhaW4iOiJtb2NrLWNoYWluIiwibWVzc2FnZV9pZCI6IlN1Y2NlZWRlZE9uU291cmNlQ2hhaW41In0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNSJ9LHsiY2NfaWQiOnsic291cmNlX2NoYWluIjoibW9jay1jaGFpbiIsIm1lc3NhZ2VfaWQiOiJTdWNjZWVkZWRPblNvdXJjZUNoYWluNiJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiU3VjY2VlZGVkT25Tb3VyY2VDaGFpbjcifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3In0seyJjY19pZCI6eyJzb3VyY2VfY2hhaW4iOiJtb2NrLWNoYWluIiwibWVzc2FnZV9pZCI6IlN1Y2NlZWRlZE9uU291cmNlQ2hhaW44In0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwOCJ9LHsiY2NfaWQiOnsic291cmNlX2NoYWluIjoibW9jay1jaGFpbiIsIm1lc3NhZ2VfaWQiOiJTdWNjZWVkZWRPblNvdXJjZUNoYWluOSJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkifV19",
               "funds": []
             }
           }
@@ -259,7 +259,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain0"
           },
           {
@@ -288,7 +288,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain1"
           },
           {
@@ -317,7 +317,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain2"
           },
           {
@@ -346,7 +346,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain3"
           },
           {
@@ -375,7 +375,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain4"
           },
           {
@@ -404,7 +404,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain5"
           },
           {
@@ -433,7 +433,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain6"
           },
           {
@@ -462,7 +462,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain7"
           },
           {
@@ -491,7 +491,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain8"
           },
           {
@@ -520,7 +520,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain9"
           },
           {
@@ -556,7 +556,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain0"
           },
           {
@@ -585,7 +585,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain1"
           },
           {
@@ -614,7 +614,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain2"
           },
           {
@@ -643,7 +643,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain3"
           },
           {
@@ -672,7 +672,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain4"
           },
           {
@@ -701,7 +701,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain5"
           },
           {
@@ -730,7 +730,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain6"
           },
           {
@@ -759,7 +759,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain7"
           },
           {
@@ -788,7 +788,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain8"
           },
           {
@@ -817,7 +817,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain9"
           },
           {
@@ -853,7 +853,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain0"
           },
           {
@@ -882,7 +882,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain1"
           },
           {
@@ -911,7 +911,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain2"
           },
           {
@@ -940,7 +940,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain3"
           },
           {
@@ -969,7 +969,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain4"
           },
           {
@@ -998,7 +998,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain5"
           },
           {
@@ -1027,7 +1027,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain6"
           },
           {
@@ -1056,7 +1056,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain7"
           },
           {
@@ -1085,7 +1085,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain8"
           },
           {
@@ -1114,7 +1114,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain9"
           },
           {
@@ -1150,7 +1150,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify0"
           },
           {
@@ -1179,7 +1179,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify1"
           },
           {
@@ -1208,7 +1208,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify2"
           },
           {
@@ -1237,7 +1237,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify3"
           },
           {
@@ -1266,7 +1266,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify4"
           },
           {
@@ -1295,7 +1295,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify5"
           },
           {
@@ -1324,7 +1324,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify6"
           },
           {
@@ -1353,7 +1353,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify7"
           },
           {
@@ -1382,7 +1382,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify8"
           },
           {
@@ -1411,7 +1411,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify9"
           },
           {
@@ -1447,7 +1447,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress0"
           },
           {
@@ -1476,7 +1476,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress1"
           },
           {
@@ -1505,7 +1505,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress2"
           },
           {
@@ -1534,7 +1534,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress3"
           },
           {
@@ -1563,7 +1563,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress4"
           },
           {
@@ -1592,7 +1592,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress5"
           },
           {
@@ -1621,7 +1621,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress6"
           },
           {
@@ -1650,7 +1650,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress7"
           },
           {
@@ -1679,7 +1679,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress8"
           },
           {
@@ -1708,7 +1708,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress9"
           },
           {
@@ -1744,7 +1744,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown0"
           },
           {
@@ -1773,7 +1773,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown1"
           },
           {
@@ -1802,7 +1802,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown2"
           },
           {
@@ -1831,7 +1831,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown3"
           },
           {
@@ -1860,7 +1860,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown4"
           },
           {
@@ -1889,7 +1889,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown5"
           },
           {
@@ -1918,7 +1918,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown6"
           },
           {
@@ -1947,7 +1947,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown7"
           },
           {
@@ -1976,7 +1976,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown8"
           },
           {
@@ -2005,7 +2005,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown9"
           },
           {
@@ -2041,7 +2041,7 @@
           "wasm": {
             "execute": {
               "contract_addr": "router",
-              "msg": "eyJyb3V0ZV9tZXNzYWdlcyI6W3siY2NfaWQiOnsiY2hhaW4iOiJtb2NrLWNoYWluIiwiaWQiOiJTdWNjZWVkZWRPblNvdXJjZUNoYWluMCJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiU3VjY2VlZGVkT25Tb3VyY2VDaGFpbjEifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxIn0seyJjY19pZCI6eyJjaGFpbiI6Im1vY2stY2hhaW4iLCJpZCI6IlN1Y2NlZWRlZE9uU291cmNlQ2hhaW4yIn0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMiJ9LHsiY2NfaWQiOnsiY2hhaW4iOiJtb2NrLWNoYWluIiwiaWQiOiJTdWNjZWVkZWRPblNvdXJjZUNoYWluMyJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiU3VjY2VlZGVkT25Tb3VyY2VDaGFpbjQifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0In0seyJjY19pZCI6eyJjaGFpbiI6Im1vY2stY2hhaW4iLCJpZCI6IlN1Y2NlZWRlZE9uU291cmNlQ2hhaW41In0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNSJ9LHsiY2NfaWQiOnsiY2hhaW4iOiJtb2NrLWNoYWluIiwiaWQiOiJTdWNjZWVkZWRPblNvdXJjZUNoYWluNiJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiU3VjY2VlZGVkT25Tb3VyY2VDaGFpbjcifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3In0seyJjY19pZCI6eyJjaGFpbiI6Im1vY2stY2hhaW4iLCJpZCI6IlN1Y2NlZWRlZE9uU291cmNlQ2hhaW44In0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwOCJ9LHsiY2NfaWQiOnsiY2hhaW4iOiJtb2NrLWNoYWluIiwiaWQiOiJTdWNjZWVkZWRPblNvdXJjZUNoYWluOSJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkifV19",
+              "msg": "eyJyb3V0ZV9tZXNzYWdlcyI6W3siY2NfaWQiOnsic291cmNlX2NoYWluIjoibW9jay1jaGFpbiIsIm1lc3NhZ2VfaWQiOiJTdWNjZWVkZWRPblNvdXJjZUNoYWluMCJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiU3VjY2VlZGVkT25Tb3VyY2VDaGFpbjEifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxIn0seyJjY19pZCI6eyJzb3VyY2VfY2hhaW4iOiJtb2NrLWNoYWluIiwibWVzc2FnZV9pZCI6IlN1Y2NlZWRlZE9uU291cmNlQ2hhaW4yIn0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMiJ9LHsiY2NfaWQiOnsic291cmNlX2NoYWluIjoibW9jay1jaGFpbiIsIm1lc3NhZ2VfaWQiOiJTdWNjZWVkZWRPblNvdXJjZUNoYWluMyJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiU3VjY2VlZGVkT25Tb3VyY2VDaGFpbjQifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0In0seyJjY19pZCI6eyJzb3VyY2VfY2hhaW4iOiJtb2NrLWNoYWluIiwibWVzc2FnZV9pZCI6IlN1Y2NlZWRlZE9uU291cmNlQ2hhaW41In0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNSJ9LHsiY2NfaWQiOnsic291cmNlX2NoYWluIjoibW9jay1jaGFpbiIsIm1lc3NhZ2VfaWQiOiJTdWNjZWVkZWRPblNvdXJjZUNoYWluNiJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiU3VjY2VlZGVkT25Tb3VyY2VDaGFpbjcifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3In0seyJjY19pZCI6eyJzb3VyY2VfY2hhaW4iOiJtb2NrLWNoYWluIiwibWVzc2FnZV9pZCI6IlN1Y2NlZWRlZE9uU291cmNlQ2hhaW44In0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwOCJ9LHsiY2NfaWQiOnsic291cmNlX2NoYWluIjoibW9jay1jaGFpbiIsIm1lc3NhZ2VfaWQiOiJTdWNjZWVkZWRPblNvdXJjZUNoYWluOSJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkifV19",
               "funds": []
             }
           }
@@ -2056,7 +2056,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain0"
           },
           {
@@ -2085,7 +2085,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain1"
           },
           {
@@ -2114,7 +2114,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain2"
           },
           {
@@ -2143,7 +2143,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain3"
           },
           {
@@ -2172,7 +2172,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain4"
           },
           {
@@ -2201,7 +2201,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain5"
           },
           {
@@ -2230,7 +2230,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain6"
           },
           {
@@ -2259,7 +2259,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain7"
           },
           {
@@ -2288,7 +2288,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain8"
           },
           {
@@ -2317,7 +2317,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain9"
           },
           {
@@ -2346,7 +2346,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain0"
           },
           {
@@ -2375,7 +2375,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain1"
           },
           {
@@ -2404,7 +2404,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain2"
           },
           {
@@ -2433,7 +2433,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain3"
           },
           {
@@ -2462,7 +2462,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain4"
           },
           {
@@ -2491,7 +2491,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain5"
           },
           {
@@ -2520,7 +2520,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain6"
           },
           {
@@ -2549,7 +2549,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain7"
           },
           {
@@ -2578,7 +2578,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain8"
           },
           {
@@ -2607,7 +2607,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain9"
           },
           {
@@ -2636,7 +2636,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain0"
           },
           {
@@ -2665,7 +2665,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain1"
           },
           {
@@ -2694,7 +2694,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain2"
           },
           {
@@ -2723,7 +2723,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain3"
           },
           {
@@ -2752,7 +2752,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain4"
           },
           {
@@ -2781,7 +2781,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain5"
           },
           {
@@ -2810,7 +2810,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain6"
           },
           {
@@ -2839,7 +2839,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain7"
           },
           {
@@ -2868,7 +2868,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain8"
           },
           {
@@ -2897,7 +2897,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain9"
           },
           {
@@ -2926,7 +2926,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify0"
           },
           {
@@ -2955,7 +2955,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify1"
           },
           {
@@ -2984,7 +2984,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify2"
           },
           {
@@ -3013,7 +3013,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify3"
           },
           {
@@ -3042,7 +3042,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify4"
           },
           {
@@ -3071,7 +3071,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify5"
           },
           {
@@ -3100,7 +3100,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify6"
           },
           {
@@ -3129,7 +3129,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify7"
           },
           {
@@ -3158,7 +3158,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify8"
           },
           {
@@ -3187,7 +3187,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify9"
           },
           {
@@ -3216,7 +3216,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress0"
           },
           {
@@ -3245,7 +3245,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress1"
           },
           {
@@ -3274,7 +3274,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress2"
           },
           {
@@ -3303,7 +3303,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress3"
           },
           {
@@ -3332,7 +3332,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress4"
           },
           {
@@ -3361,7 +3361,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress5"
           },
           {
@@ -3390,7 +3390,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress6"
           },
           {
@@ -3419,7 +3419,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress7"
           },
           {
@@ -3448,7 +3448,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress8"
           },
           {
@@ -3477,7 +3477,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress9"
           },
           {
@@ -3506,7 +3506,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown0"
           },
           {
@@ -3535,7 +3535,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown1"
           },
           {
@@ -3564,7 +3564,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown2"
           },
           {
@@ -3593,7 +3593,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown3"
           },
           {
@@ -3622,7 +3622,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown4"
           },
           {
@@ -3651,7 +3651,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown5"
           },
           {
@@ -3680,7 +3680,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown6"
           },
           {
@@ -3709,7 +3709,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown7"
           },
           {
@@ -3738,7 +3738,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown8"
           },
           {
@@ -3767,7 +3767,7 @@
         "type": "unfit_for_routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown9"
           },
           {
diff --git a/contracts/gateway/tests/test_route_outgoing.json b/contracts/gateway/tests/test_route_outgoing.json
index ef0605400..6590430c4 100644
--- a/contracts/gateway/tests/test_route_outgoing.json
+++ b/contracts/gateway/tests/test_route_outgoing.json
@@ -13,7 +13,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain0"
           },
           {
@@ -49,7 +49,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain0"
           },
           {
@@ -85,7 +85,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain0"
           },
           {
@@ -121,7 +121,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify0"
           },
           {
@@ -157,7 +157,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress0"
           },
           {
@@ -193,7 +193,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown0"
           },
           {
@@ -229,7 +229,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain0"
           },
           {
@@ -258,7 +258,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain1"
           },
           {
@@ -287,7 +287,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain2"
           },
           {
@@ -316,7 +316,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain3"
           },
           {
@@ -345,7 +345,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain4"
           },
           {
@@ -374,7 +374,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain5"
           },
           {
@@ -403,7 +403,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain6"
           },
           {
@@ -432,7 +432,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain7"
           },
           {
@@ -461,7 +461,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain8"
           },
           {
@@ -490,7 +490,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain9"
           },
           {
@@ -526,7 +526,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain0"
           },
           {
@@ -555,7 +555,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain1"
           },
           {
@@ -584,7 +584,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain2"
           },
           {
@@ -613,7 +613,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain3"
           },
           {
@@ -642,7 +642,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain4"
           },
           {
@@ -671,7 +671,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain5"
           },
           {
@@ -700,7 +700,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain6"
           },
           {
@@ -729,7 +729,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain7"
           },
           {
@@ -758,7 +758,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain8"
           },
           {
@@ -787,7 +787,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain9"
           },
           {
@@ -823,7 +823,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain0"
           },
           {
@@ -852,7 +852,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain1"
           },
           {
@@ -881,7 +881,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain2"
           },
           {
@@ -910,7 +910,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain3"
           },
           {
@@ -939,7 +939,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain4"
           },
           {
@@ -968,7 +968,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain5"
           },
           {
@@ -997,7 +997,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain6"
           },
           {
@@ -1026,7 +1026,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain7"
           },
           {
@@ -1055,7 +1055,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain8"
           },
           {
@@ -1084,7 +1084,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain9"
           },
           {
@@ -1120,7 +1120,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify0"
           },
           {
@@ -1149,7 +1149,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify1"
           },
           {
@@ -1178,7 +1178,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify2"
           },
           {
@@ -1207,7 +1207,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify3"
           },
           {
@@ -1236,7 +1236,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify4"
           },
           {
@@ -1265,7 +1265,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify5"
           },
           {
@@ -1294,7 +1294,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify6"
           },
           {
@@ -1323,7 +1323,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify7"
           },
           {
@@ -1352,7 +1352,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify8"
           },
           {
@@ -1381,7 +1381,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify9"
           },
           {
@@ -1417,7 +1417,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress0"
           },
           {
@@ -1446,7 +1446,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress1"
           },
           {
@@ -1475,7 +1475,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress2"
           },
           {
@@ -1504,7 +1504,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress3"
           },
           {
@@ -1533,7 +1533,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress4"
           },
           {
@@ -1562,7 +1562,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress5"
           },
           {
@@ -1591,7 +1591,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress6"
           },
           {
@@ -1620,7 +1620,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress7"
           },
           {
@@ -1649,7 +1649,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress8"
           },
           {
@@ -1678,7 +1678,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress9"
           },
           {
@@ -1714,7 +1714,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown0"
           },
           {
@@ -1743,7 +1743,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown1"
           },
           {
@@ -1772,7 +1772,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown2"
           },
           {
@@ -1801,7 +1801,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown3"
           },
           {
@@ -1830,7 +1830,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown4"
           },
           {
@@ -1859,7 +1859,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown5"
           },
           {
@@ -1888,7 +1888,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown6"
           },
           {
@@ -1917,7 +1917,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown7"
           },
           {
@@ -1946,7 +1946,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown8"
           },
           {
@@ -1975,7 +1975,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown9"
           },
           {
@@ -2011,7 +2011,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain0"
           },
           {
@@ -2040,7 +2040,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain1"
           },
           {
@@ -2069,7 +2069,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain2"
           },
           {
@@ -2098,7 +2098,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain3"
           },
           {
@@ -2127,7 +2127,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain4"
           },
           {
@@ -2156,7 +2156,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain5"
           },
           {
@@ -2185,7 +2185,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain6"
           },
           {
@@ -2214,7 +2214,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain7"
           },
           {
@@ -2243,7 +2243,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain8"
           },
           {
@@ -2272,7 +2272,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain9"
           },
           {
@@ -2301,7 +2301,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain0"
           },
           {
@@ -2330,7 +2330,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain1"
           },
           {
@@ -2359,7 +2359,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain2"
           },
           {
@@ -2388,7 +2388,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain3"
           },
           {
@@ -2417,7 +2417,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain4"
           },
           {
@@ -2446,7 +2446,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain5"
           },
           {
@@ -2475,7 +2475,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain6"
           },
           {
@@ -2504,7 +2504,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain7"
           },
           {
@@ -2533,7 +2533,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain8"
           },
           {
@@ -2562,7 +2562,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain9"
           },
           {
@@ -2591,7 +2591,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain0"
           },
           {
@@ -2620,7 +2620,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain1"
           },
           {
@@ -2649,7 +2649,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain2"
           },
           {
@@ -2678,7 +2678,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain3"
           },
           {
@@ -2707,7 +2707,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain4"
           },
           {
@@ -2736,7 +2736,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain5"
           },
           {
@@ -2765,7 +2765,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain6"
           },
           {
@@ -2794,7 +2794,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain7"
           },
           {
@@ -2823,7 +2823,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain8"
           },
           {
@@ -2852,7 +2852,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain9"
           },
           {
@@ -2881,7 +2881,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify0"
           },
           {
@@ -2910,7 +2910,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify1"
           },
           {
@@ -2939,7 +2939,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify2"
           },
           {
@@ -2968,7 +2968,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify3"
           },
           {
@@ -2997,7 +2997,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify4"
           },
           {
@@ -3026,7 +3026,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify5"
           },
           {
@@ -3055,7 +3055,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify6"
           },
           {
@@ -3084,7 +3084,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify7"
           },
           {
@@ -3113,7 +3113,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify8"
           },
           {
@@ -3142,7 +3142,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify9"
           },
           {
@@ -3171,7 +3171,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress0"
           },
           {
@@ -3200,7 +3200,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress1"
           },
           {
@@ -3229,7 +3229,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress2"
           },
           {
@@ -3258,7 +3258,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress3"
           },
           {
@@ -3287,7 +3287,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress4"
           },
           {
@@ -3316,7 +3316,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress5"
           },
           {
@@ -3345,7 +3345,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress6"
           },
           {
@@ -3374,7 +3374,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress7"
           },
           {
@@ -3403,7 +3403,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress8"
           },
           {
@@ -3432,7 +3432,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress9"
           },
           {
@@ -3461,7 +3461,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown0"
           },
           {
@@ -3490,7 +3490,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown1"
           },
           {
@@ -3519,7 +3519,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown2"
           },
           {
@@ -3548,7 +3548,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown3"
           },
           {
@@ -3577,7 +3577,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown4"
           },
           {
@@ -3606,7 +3606,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown5"
           },
           {
@@ -3635,7 +3635,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown6"
           },
           {
@@ -3664,7 +3664,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown7"
           },
           {
@@ -3693,7 +3693,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown8"
           },
           {
@@ -3722,7 +3722,7 @@
         "type": "routing",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown9"
           },
           {
diff --git a/contracts/gateway/tests/test_verify.json b/contracts/gateway/tests/test_verify.json
index 3bd7657cb..1cf376c00 100644
--- a/contracts/gateway/tests/test_verify.json
+++ b/contracts/gateway/tests/test_verify.json
@@ -13,7 +13,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain0"
           },
           {
@@ -49,7 +49,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain0"
           },
           {
@@ -85,7 +85,7 @@
           "wasm": {
             "execute": {
               "contract_addr": "verifier",
-              "msg": "eyJ2ZXJpZnlfbWVzc2FnZXMiOlt7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluMCJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAifV19",
+              "msg": "eyJ2ZXJpZnlfbWVzc2FnZXMiOlt7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluMCJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAifV19",
               "funds": []
             }
           }
@@ -100,7 +100,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain0"
           },
           {
@@ -136,7 +136,7 @@
           "wasm": {
             "execute": {
               "contract_addr": "verifier",
-              "msg": "eyJ2ZXJpZnlfbWVzc2FnZXMiOlt7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiRmFpbGVkVG9WZXJpZnkwIn0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMCJ9XX0=",
+              "msg": "eyJ2ZXJpZnlfbWVzc2FnZXMiOlt7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiRmFpbGVkVG9WZXJpZnkwIn0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMCJ9XX0=",
               "funds": []
             }
           }
@@ -151,7 +151,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify0"
           },
           {
@@ -187,7 +187,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress0"
           },
           {
@@ -223,7 +223,7 @@
           "wasm": {
             "execute": {
               "contract_addr": "verifier",
-              "msg": "eyJ2ZXJpZnlfbWVzc2FnZXMiOlt7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiVW5rbm93bjAifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwIn1dfQ==",
+              "msg": "eyJ2ZXJpZnlfbWVzc2FnZXMiOlt7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiVW5rbm93bjAifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwIn1dfQ==",
               "funds": []
             }
           }
@@ -238,7 +238,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown0"
           },
           {
@@ -274,7 +274,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain0"
           },
           {
@@ -303,7 +303,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain1"
           },
           {
@@ -332,7 +332,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain2"
           },
           {
@@ -361,7 +361,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain3"
           },
           {
@@ -390,7 +390,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain4"
           },
           {
@@ -419,7 +419,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain5"
           },
           {
@@ -448,7 +448,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain6"
           },
           {
@@ -477,7 +477,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain7"
           },
           {
@@ -506,7 +506,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain8"
           },
           {
@@ -535,7 +535,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain9"
           },
           {
@@ -571,7 +571,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain0"
           },
           {
@@ -600,7 +600,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain1"
           },
           {
@@ -629,7 +629,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain2"
           },
           {
@@ -658,7 +658,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain3"
           },
           {
@@ -687,7 +687,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain4"
           },
           {
@@ -716,7 +716,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain5"
           },
           {
@@ -745,7 +745,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain6"
           },
           {
@@ -774,7 +774,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain7"
           },
           {
@@ -803,7 +803,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain8"
           },
           {
@@ -832,7 +832,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain9"
           },
           {
@@ -868,7 +868,7 @@
           "wasm": {
             "execute": {
               "contract_addr": "verifier",
-              "msg": "eyJ2ZXJpZnlfbWVzc2FnZXMiOlt7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluMCJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluMSJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluMiJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluMyJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluNCJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluNSJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluNiJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluNyJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluOCJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluOSJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkifV19",
+              "msg": "eyJ2ZXJpZnlfbWVzc2FnZXMiOlt7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluMCJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluMSJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluMiJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluMyJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluNCJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluNSJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluNiJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluNyJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluOCJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiTm90Rm91bmRPblNvdXJjZUNoYWluOSJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkifV19",
               "funds": []
             }
           }
@@ -883,7 +883,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain0"
           },
           {
@@ -912,7 +912,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain1"
           },
           {
@@ -941,7 +941,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain2"
           },
           {
@@ -970,7 +970,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain3"
           },
           {
@@ -999,7 +999,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain4"
           },
           {
@@ -1028,7 +1028,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain5"
           },
           {
@@ -1057,7 +1057,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain6"
           },
           {
@@ -1086,7 +1086,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain7"
           },
           {
@@ -1115,7 +1115,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain8"
           },
           {
@@ -1144,7 +1144,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain9"
           },
           {
@@ -1180,7 +1180,7 @@
           "wasm": {
             "execute": {
               "contract_addr": "verifier",
-              "msg": "eyJ2ZXJpZnlfbWVzc2FnZXMiOlt7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiRmFpbGVkVG9WZXJpZnkwIn0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMCJ9LHsiY2NfaWQiOnsiY2hhaW4iOiJtb2NrLWNoYWluIiwiaWQiOiJGYWlsZWRUb1ZlcmlmeTEifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxIn0seyJjY19pZCI6eyJjaGFpbiI6Im1vY2stY2hhaW4iLCJpZCI6IkZhaWxlZFRvVmVyaWZ5MiJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiRmFpbGVkVG9WZXJpZnkzIn0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMyJ9LHsiY2NfaWQiOnsiY2hhaW4iOiJtb2NrLWNoYWluIiwiaWQiOiJGYWlsZWRUb1ZlcmlmeTQifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0In0seyJjY19pZCI6eyJjaGFpbiI6Im1vY2stY2hhaW4iLCJpZCI6IkZhaWxlZFRvVmVyaWZ5NSJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiRmFpbGVkVG9WZXJpZnk2In0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNiJ9LHsiY2NfaWQiOnsiY2hhaW4iOiJtb2NrLWNoYWluIiwiaWQiOiJGYWlsZWRUb1ZlcmlmeTcifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3In0seyJjY19pZCI6eyJjaGFpbiI6Im1vY2stY2hhaW4iLCJpZCI6IkZhaWxlZFRvVmVyaWZ5OCJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiRmFpbGVkVG9WZXJpZnk5In0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOSJ9XX0=",
+              "msg": "eyJ2ZXJpZnlfbWVzc2FnZXMiOlt7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiRmFpbGVkVG9WZXJpZnkwIn0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMCJ9LHsiY2NfaWQiOnsic291cmNlX2NoYWluIjoibW9jay1jaGFpbiIsIm1lc3NhZ2VfaWQiOiJGYWlsZWRUb1ZlcmlmeTEifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxIn0seyJjY19pZCI6eyJzb3VyY2VfY2hhaW4iOiJtb2NrLWNoYWluIiwibWVzc2FnZV9pZCI6IkZhaWxlZFRvVmVyaWZ5MiJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiRmFpbGVkVG9WZXJpZnkzIn0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMyJ9LHsiY2NfaWQiOnsic291cmNlX2NoYWluIjoibW9jay1jaGFpbiIsIm1lc3NhZ2VfaWQiOiJGYWlsZWRUb1ZlcmlmeTQifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0In0seyJjY19pZCI6eyJzb3VyY2VfY2hhaW4iOiJtb2NrLWNoYWluIiwibWVzc2FnZV9pZCI6IkZhaWxlZFRvVmVyaWZ5NSJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiRmFpbGVkVG9WZXJpZnk2In0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNiJ9LHsiY2NfaWQiOnsic291cmNlX2NoYWluIjoibW9jay1jaGFpbiIsIm1lc3NhZ2VfaWQiOiJGYWlsZWRUb1ZlcmlmeTcifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3In0seyJjY19pZCI6eyJzb3VyY2VfY2hhaW4iOiJtb2NrLWNoYWluIiwibWVzc2FnZV9pZCI6IkZhaWxlZFRvVmVyaWZ5OCJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiRmFpbGVkVG9WZXJpZnk5In0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOSJ9XX0=",
               "funds": []
             }
           }
@@ -1195,7 +1195,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify0"
           },
           {
@@ -1224,7 +1224,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify1"
           },
           {
@@ -1253,7 +1253,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify2"
           },
           {
@@ -1282,7 +1282,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify3"
           },
           {
@@ -1311,7 +1311,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify4"
           },
           {
@@ -1340,7 +1340,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify5"
           },
           {
@@ -1369,7 +1369,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify6"
           },
           {
@@ -1398,7 +1398,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify7"
           },
           {
@@ -1427,7 +1427,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify8"
           },
           {
@@ -1456,7 +1456,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify9"
           },
           {
@@ -1492,7 +1492,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress0"
           },
           {
@@ -1521,7 +1521,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress1"
           },
           {
@@ -1550,7 +1550,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress2"
           },
           {
@@ -1579,7 +1579,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress3"
           },
           {
@@ -1608,7 +1608,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress4"
           },
           {
@@ -1637,7 +1637,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress5"
           },
           {
@@ -1666,7 +1666,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress6"
           },
           {
@@ -1695,7 +1695,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress7"
           },
           {
@@ -1724,7 +1724,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress8"
           },
           {
@@ -1753,7 +1753,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress9"
           },
           {
@@ -1789,7 +1789,7 @@
           "wasm": {
             "execute": {
               "contract_addr": "verifier",
-              "msg": "eyJ2ZXJpZnlfbWVzc2FnZXMiOlt7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiVW5rbm93bjAifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwIn0seyJjY19pZCI6eyJjaGFpbiI6Im1vY2stY2hhaW4iLCJpZCI6IlVua25vd24xIn0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMSJ9LHsiY2NfaWQiOnsiY2hhaW4iOiJtb2NrLWNoYWluIiwiaWQiOiJVbmtub3duMiJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiVW5rbm93bjMifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzIn0seyJjY19pZCI6eyJjaGFpbiI6Im1vY2stY2hhaW4iLCJpZCI6IlVua25vd240In0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNCJ9LHsiY2NfaWQiOnsiY2hhaW4iOiJtb2NrLWNoYWluIiwiaWQiOiJVbmtub3duNSJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiVW5rbm93bjYifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2In0seyJjY19pZCI6eyJjaGFpbiI6Im1vY2stY2hhaW4iLCJpZCI6IlVua25vd243In0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNyJ9LHsiY2NfaWQiOnsiY2hhaW4iOiJtb2NrLWNoYWluIiwiaWQiOiJVbmtub3duOCJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgifSx7ImNjX2lkIjp7ImNoYWluIjoibW9jay1jaGFpbiIsImlkIjoiVW5rbm93bjkifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5In1dfQ==",
+              "msg": "eyJ2ZXJpZnlfbWVzc2FnZXMiOlt7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiVW5rbm93bjAifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwIn0seyJjY19pZCI6eyJzb3VyY2VfY2hhaW4iOiJtb2NrLWNoYWluIiwibWVzc2FnZV9pZCI6IlVua25vd24xIn0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMSJ9LHsiY2NfaWQiOnsic291cmNlX2NoYWluIjoibW9jay1jaGFpbiIsIm1lc3NhZ2VfaWQiOiJVbmtub3duMiJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIwMjAyMDIifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiVW5rbm93bjMifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzIn0seyJjY19pZCI6eyJzb3VyY2VfY2hhaW4iOiJtb2NrLWNoYWluIiwibWVzc2FnZV9pZCI6IlVua25vd240In0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNDA0MDQwNCJ9LHsiY2NfaWQiOnsic291cmNlX2NoYWluIjoibW9jay1jaGFpbiIsIm1lc3NhZ2VfaWQiOiJVbmtub3duNSJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUwNTA1MDUifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiVW5rbm93bjYifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2MDYwNjA2In0seyJjY19pZCI6eyJzb3VyY2VfY2hhaW4iOiJtb2NrLWNoYWluIiwibWVzc2FnZV9pZCI6IlVua25vd243In0sInNvdXJjZV9hZGRyZXNzIjoiaWRjIiwiZGVzdGluYXRpb25fY2hhaW4iOiJtb2NrLWNoYWluLTIiLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiaWRjIiwicGF5bG9hZF9oYXNoIjoiMDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNzA3MDcwNyJ9LHsiY2NfaWQiOnsic291cmNlX2NoYWluIjoibW9jay1jaGFpbiIsIm1lc3NhZ2VfaWQiOiJVbmtub3duOCJ9LCJzb3VyY2VfYWRkcmVzcyI6ImlkYyIsImRlc3RpbmF0aW9uX2NoYWluIjoibW9jay1jaGFpbi0yIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImlkYyIsInBheWxvYWRfaGFzaCI6IjA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgwODA4MDgifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6Im1vY2stY2hhaW4iLCJtZXNzYWdlX2lkIjoiVW5rbm93bjkifSwic291cmNlX2FkZHJlc3MiOiJpZGMiLCJkZXN0aW5hdGlvbl9jaGFpbiI6Im1vY2stY2hhaW4tMiIsImRlc3RpbmF0aW9uX2FkZHJlc3MiOiJpZGMiLCJwYXlsb2FkX2hhc2giOiIwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5MDkwOTA5In1dfQ==",
               "funds": []
             }
           }
@@ -1804,7 +1804,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown0"
           },
           {
@@ -1833,7 +1833,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown1"
           },
           {
@@ -1862,7 +1862,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown2"
           },
           {
@@ -1891,7 +1891,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown3"
           },
           {
@@ -1920,7 +1920,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown4"
           },
           {
@@ -1949,7 +1949,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown5"
           },
           {
@@ -1978,7 +1978,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown6"
           },
           {
@@ -2007,7 +2007,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown7"
           },
           {
@@ -2036,7 +2036,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown8"
           },
           {
@@ -2065,7 +2065,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown9"
           },
           {
@@ -2101,7 +2101,7 @@
           "wasm": {
             "execute": {
               "contract_addr": "verifier",
-              "msg": "{"verify_messages":[{"cc_id":{"chain":"mock-chain","id":"NotFoundOnSourceChain0"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0000000000000000000000000000000000000000000000000000000000000000"},{"cc_id":{"chain":"mock-chain","id":"NotFoundOnSourceChain1"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0101010101010101010101010101010101010101010101010101010101010101"},{"cc_id":{"chain":"mock-chain","id":"NotFoundOnSourceChain2"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0202020202020202020202020202020202020202020202020202020202020202"},{"cc_id":{"chain":"mock-chain","id":"NotFoundOnSourceChain3"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0303030303030303030303030303030303030303030303030303030303030303"},{"cc_id":{"chain":"mock-chain","id":"NotFoundOnSourceChain4"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0404040404040404040404040404040404040404040404040404040404040404"},{"cc_id":{"chain":"mock-chain","id":"NotFoundOnSourceChain5"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0505050505050505050505050505050505050505050505050505050505050505"},{"cc_id":{"chain":"mock-chain","id":"NotFoundOnSourceChain6"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0606060606060606060606060606060606060606060606060606060606060606"},{"cc_id":{"chain":"mock-chain","id":"NotFoundOnSourceChain7"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0707070707070707070707070707070707070707070707070707070707070707"},{"cc_id":{"chain":"mock-chain","id":"NotFoundOnSourceChain8"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0808080808080808080808080808080808080808080808080808080808080808"},{"cc_id":{"chain":"mock-chain","id":"NotFoundOnSourceChain9"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0909090909090909090909090909090909090909090909090909090909090909"},{"cc_id":{"chain":"mock-chain","id":"FailedToVerify0"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0000000000000000000000000000000000000000000000000000000000000000"},{"cc_id":{"chain":"mock-chain","id":"FailedToVerify1"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0101010101010101010101010101010101010101010101010101010101010101"},{"cc_id":{"chain":"mock-chain","id":"FailedToVerify2"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0202020202020202020202020202020202020202020202020202020202020202"},{"cc_id":{"chain":"mock-chain","id":"FailedToVerify3"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0303030303030303030303030303030303030303030303030303030303030303"},{"cc_id":{"chain":"mock-chain","id":"FailedToVerify4"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0404040404040404040404040404040404040404040404040404040404040404"},{"cc_id":{"chain":"mock-chain","id":"FailedToVerify5"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0505050505050505050505050505050505050505050505050505050505050505"},{"cc_id":{"chain":"mock-chain","id":"FailedToVerify6"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0606060606060606060606060606060606060606060606060606060606060606"},{"cc_id":{"chain":"mock-chain","id":"FailedToVerify7"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0707070707070707070707070707070707070707070707070707070707070707"},{"cc_id":{"chain":"mock-chain","id":"FailedToVerify8"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0808080808080808080808080808080808080808080808080808080808080808"},{"cc_id":{"chain":"mock-chain","id":"FailedToVerify9"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0909090909090909090909090909090909090909090909090909090909090909"},{"cc_id":{"chain":"mock-chain","id":"Unknown0"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0000000000000000000000000000000000000000000000000000000000000000"},{"cc_id":{"chain":"mock-chain","id":"Unknown1"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0101010101010101010101010101010101010101010101010101010101010101"},{"cc_id":{"chain":"mock-chain","id":"Unknown2"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0202020202020202020202020202020202020202020202020202020202020202"},{"cc_id":{"chain":"mock-chain","id":"Unknown3"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0303030303030303030303030303030303030303030303030303030303030303"},{"cc_id":{"chain":"mock-chain","id":"Unknown4"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0404040404040404040404040404040404040404040404040404040404040404"},{"cc_id":{"chain":"mock-chain","id":"Unknown5"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0505050505050505050505050505050505050505050505050505050505050505"},{"cc_id":{"chain":"mock-chain","id":"Unknown6"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0606060606060606060606060606060606060606060606060606060606060606"},{"cc_id":{"chain":"mock-chain","id":"Unknown7"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0707070707070707070707070707070707070707070707070707070707070707"},{"cc_id":{"chain":"mock-chain","id":"Unknown8"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0808080808080808080808080808080808080808080808080808080808080808"},{"cc_id":{"chain":"mock-chain","id":"Unknown9"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0909090909090909090909090909090909090909090909090909090909090909"}]}",
+              "msg": "{"verify_messages":[{"cc_id":{"source_chain":"mock-chain","message_id":"NotFoundOnSourceChain0"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0000000000000000000000000000000000000000000000000000000000000000"},{"cc_id":{"source_chain":"mock-chain","message_id":"NotFoundOnSourceChain1"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0101010101010101010101010101010101010101010101010101010101010101"},{"cc_id":{"source_chain":"mock-chain","message_id":"NotFoundOnSourceChain2"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0202020202020202020202020202020202020202020202020202020202020202"},{"cc_id":{"source_chain":"mock-chain","message_id":"NotFoundOnSourceChain3"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0303030303030303030303030303030303030303030303030303030303030303"},{"cc_id":{"source_chain":"mock-chain","message_id":"NotFoundOnSourceChain4"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0404040404040404040404040404040404040404040404040404040404040404"},{"cc_id":{"source_chain":"mock-chain","message_id":"NotFoundOnSourceChain5"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0505050505050505050505050505050505050505050505050505050505050505"},{"cc_id":{"source_chain":"mock-chain","message_id":"NotFoundOnSourceChain6"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0606060606060606060606060606060606060606060606060606060606060606"},{"cc_id":{"source_chain":"mock-chain","message_id":"NotFoundOnSourceChain7"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0707070707070707070707070707070707070707070707070707070707070707"},{"cc_id":{"source_chain":"mock-chain","message_id":"NotFoundOnSourceChain8"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0808080808080808080808080808080808080808080808080808080808080808"},{"cc_id":{"source_chain":"mock-chain","message_id":"NotFoundOnSourceChain9"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0909090909090909090909090909090909090909090909090909090909090909"},{"cc_id":{"source_chain":"mock-chain","message_id":"FailedToVerify0"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0000000000000000000000000000000000000000000000000000000000000000"},{"cc_id":{"source_chain":"mock-chain","message_id":"FailedToVerify1"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0101010101010101010101010101010101010101010101010101010101010101"},{"cc_id":{"source_chain":"mock-chain","message_id":"FailedToVerify2"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0202020202020202020202020202020202020202020202020202020202020202"},{"cc_id":{"source_chain":"mock-chain","message_id":"FailedToVerify3"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0303030303030303030303030303030303030303030303030303030303030303"},{"cc_id":{"source_chain":"mock-chain","message_id":"FailedToVerify4"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0404040404040404040404040404040404040404040404040404040404040404"},{"cc_id":{"source_chain":"mock-chain","message_id":"FailedToVerify5"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0505050505050505050505050505050505050505050505050505050505050505"},{"cc_id":{"source_chain":"mock-chain","message_id":"FailedToVerify6"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0606060606060606060606060606060606060606060606060606060606060606"},{"cc_id":{"source_chain":"mock-chain","message_id":"FailedToVerify7"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0707070707070707070707070707070707070707070707070707070707070707"},{"cc_id":{"source_chain":"mock-chain","message_id":"FailedToVerify8"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0808080808080808080808080808080808080808080808080808080808080808"},{"cc_id":{"source_chain":"mock-chain","message_id":"FailedToVerify9"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0909090909090909090909090909090909090909090909090909090909090909"},{"cc_id":{"source_chain":"mock-chain","message_id":"Unknown0"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0000000000000000000000000000000000000000000000000000000000000000"},{"cc_id":{"source_chain":"mock-chain","message_id":"Unknown1"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0101010101010101010101010101010101010101010101010101010101010101"},{"cc_id":{"source_chain":"mock-chain","message_id":"Unknown2"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0202020202020202020202020202020202020202020202020202020202020202"},{"cc_id":{"source_chain":"mock-chain","message_id":"Unknown3"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0303030303030303030303030303030303030303030303030303030303030303"},{"cc_id":{"source_chain":"mock-chain","message_id":"Unknown4"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0404040404040404040404040404040404040404040404040404040404040404"},{"cc_id":{"source_chain":"mock-chain","message_id":"Unknown5"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0505050505050505050505050505050505050505050505050505050505050505"},{"cc_id":{"source_chain":"mock-chain","message_id":"Unknown6"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0606060606060606060606060606060606060606060606060606060606060606"},{"cc_id":{"source_chain":"mock-chain","message_id":"Unknown7"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0707070707070707070707070707070707070707070707070707070707070707"},{"cc_id":{"source_chain":"mock-chain","message_id":"Unknown8"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0808080808080808080808080808080808080808080808080808080808080808"},{"cc_id":{"source_chain":"mock-chain","message_id":"Unknown9"},"source_address":"idc","destination_chain":"mock-chain-2","destination_address":"idc","payload_hash":"0909090909090909090909090909090909090909090909090909090909090909"}]}",
               "funds": []
             }
           }
@@ -2116,7 +2116,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain0"
           },
           {
@@ -2145,7 +2145,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain1"
           },
           {
@@ -2174,7 +2174,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain2"
           },
           {
@@ -2203,7 +2203,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain3"
           },
           {
@@ -2232,7 +2232,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain4"
           },
           {
@@ -2261,7 +2261,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain5"
           },
           {
@@ -2290,7 +2290,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain6"
           },
           {
@@ -2319,7 +2319,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain7"
           },
           {
@@ -2348,7 +2348,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain8"
           },
           {
@@ -2377,7 +2377,7 @@
         "type": "already_verified",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "SucceededOnSourceChain9"
           },
           {
@@ -2406,7 +2406,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain0"
           },
           {
@@ -2435,7 +2435,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain1"
           },
           {
@@ -2464,7 +2464,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain2"
           },
           {
@@ -2493,7 +2493,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain3"
           },
           {
@@ -2522,7 +2522,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain4"
           },
           {
@@ -2551,7 +2551,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain5"
           },
           {
@@ -2580,7 +2580,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain6"
           },
           {
@@ -2609,7 +2609,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain7"
           },
           {
@@ -2638,7 +2638,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain8"
           },
           {
@@ -2667,7 +2667,7 @@
         "type": "already_rejected",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedOnSourceChain9"
           },
           {
@@ -2696,7 +2696,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain0"
           },
           {
@@ -2725,7 +2725,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain1"
           },
           {
@@ -2754,7 +2754,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain2"
           },
           {
@@ -2783,7 +2783,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain3"
           },
           {
@@ -2812,7 +2812,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain4"
           },
           {
@@ -2841,7 +2841,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain5"
           },
           {
@@ -2870,7 +2870,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain6"
           },
           {
@@ -2899,7 +2899,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain7"
           },
           {
@@ -2928,7 +2928,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain8"
           },
           {
@@ -2957,7 +2957,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "NotFoundOnSourceChain9"
           },
           {
@@ -2986,7 +2986,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify0"
           },
           {
@@ -3015,7 +3015,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify1"
           },
           {
@@ -3044,7 +3044,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify2"
           },
           {
@@ -3073,7 +3073,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify3"
           },
           {
@@ -3102,7 +3102,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify4"
           },
           {
@@ -3131,7 +3131,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify5"
           },
           {
@@ -3160,7 +3160,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify6"
           },
           {
@@ -3189,7 +3189,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify7"
           },
           {
@@ -3218,7 +3218,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify8"
           },
           {
@@ -3247,7 +3247,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "FailedToVerify9"
           },
           {
@@ -3276,7 +3276,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress0"
           },
           {
@@ -3305,7 +3305,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress1"
           },
           {
@@ -3334,7 +3334,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress2"
           },
           {
@@ -3363,7 +3363,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress3"
           },
           {
@@ -3392,7 +3392,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress4"
           },
           {
@@ -3421,7 +3421,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress5"
           },
           {
@@ -3450,7 +3450,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress6"
           },
           {
@@ -3479,7 +3479,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress7"
           },
           {
@@ -3508,7 +3508,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress8"
           },
           {
@@ -3537,7 +3537,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "InProgress9"
           },
           {
@@ -3566,7 +3566,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown0"
           },
           {
@@ -3595,7 +3595,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown1"
           },
           {
@@ -3624,7 +3624,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown2"
           },
           {
@@ -3653,7 +3653,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown3"
           },
           {
@@ -3682,7 +3682,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown4"
           },
           {
@@ -3711,7 +3711,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown5"
           },
           {
@@ -3740,7 +3740,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown6"
           },
           {
@@ -3769,7 +3769,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown7"
           },
           {
@@ -3798,7 +3798,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown8"
           },
           {
@@ -3827,7 +3827,7 @@
         "type": "verifying",
         "attributes": [
           {
-            "key": "id",
+            "key": "message_id",
             "value": "Unknown9"
           },
           {
diff --git a/contracts/multisig-prover/src/contract.rs b/contracts/multisig-prover/src/contract.rs
index 9bde0dad4..270a2a15d 100644
--- a/contracts/multisig-prover/src/contract.rs
+++ b/contracts/multisig-prover/src/contract.rs
@@ -114,7 +114,6 @@ pub fn migrate(
 ) -> Result<Response, axelar_wasm_std::error::ContractError> {
     migrations::v0_6_0::migrate(deps.storage)?;
 
-    cw2::set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
     Ok(Response::default())
 }
 
diff --git a/contracts/multisig-prover/src/contract/migrations/v0_6_0.rs b/contracts/multisig-prover/src/contract/migrations/v0_6_0.rs
index b872d0aa1..316fab18a 100644
--- a/contracts/multisig-prover/src/contract/migrations/v0_6_0.rs
+++ b/contracts/multisig-prover/src/contract/migrations/v0_6_0.rs
@@ -9,7 +9,7 @@ use cw_storage_plus::Item;
 use multisig::key::KeyType;
 use router_api::ChainName;
 
-use crate::contract::CONTRACT_NAME;
+use crate::contract::{CONTRACT_NAME, CONTRACT_VERSION};
 use crate::encoding::Encoder;
 use crate::state;
 
@@ -21,11 +21,19 @@ pub(crate) fn migrate(storage: &mut dyn Storage) -> Result<(), ContractError> {
     let config = CONFIG.load(storage)?;
 
     migrate_permission_control(storage, &config)?;
-
     migrate_config(storage, config)?;
+    delete_payloads(storage);
+
+    cw2::set_contract_version(storage, CONTRACT_NAME, CONTRACT_VERSION)?;
     Ok(())
 }
 
+fn delete_payloads(storage: &mut dyn Storage) {
+    state::PAYLOAD.clear(storage);
+    state::MULTISIG_SESSION_PAYLOAD.clear(storage);
+    state::REPLY_TRACKER.remove(storage);
+}
+
 fn migrate_permission_control(
     storage: &mut dyn Storage,
     config: &Config,
@@ -58,7 +66,7 @@ fn migrate_config(storage: &mut dyn Storage, config: Config) -> Result<(), Contr
 
 #[cw_serde]
 #[deprecated(since = "0.6.0", note = "only used during migration")]
-pub struct Config {
+struct Config {
     pub admin: Addr,
     pub governance: Addr,
     pub gateway: Addr,
@@ -75,7 +83,7 @@ pub struct Config {
     pub domain_separator: Hash,
 }
 #[deprecated(since = "0.6.0", note = "only used during migration")]
-pub const CONFIG: Item<Config> = Item::new("config");
+const CONFIG: Item<Config> = Item::new("config");
 
 #[cfg(test)]
 mod tests {
@@ -84,13 +92,14 @@ mod tests {
     use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
     use cosmwasm_std::{Addr, DepsMut, Env, MessageInfo, Response};
     use multisig::key::KeyType;
+    use router_api::{CrossChainId, Message};
 
     use crate::contract::migrations::v0_6_0;
-    use crate::contract::CONTRACT_NAME;
+    use crate::contract::{CONTRACT_NAME, CONTRACT_VERSION};
     use crate::encoding::Encoder;
     use crate::error::ContractError;
     use crate::msg::InstantiateMsg;
-    use crate::state;
+    use crate::{payload, state};
 
     #[test]
     fn migrate_checks_contract_version() {
@@ -106,6 +115,68 @@ mod tests {
         assert!(v0_6_0::migrate(deps.as_mut().storage).is_ok());
     }
 
+    #[test]
+    fn migrate_sets_contract_version() {
+        let mut deps = mock_dependencies();
+        instantiate_contract(deps.as_mut());
+
+        v0_6_0::migrate(deps.as_mut().storage).unwrap();
+
+        let contract_version = cw2::get_contract_version(deps.as_mut().storage).unwrap();
+        assert_eq!(contract_version.contract, CONTRACT_NAME);
+        assert_eq!(contract_version.version, CONTRACT_VERSION);
+    }
+
+    #[test]
+    fn migrate_payload() {
+        let mut deps = mock_dependencies();
+
+        instantiate_contract(deps.as_mut());
+
+        let msgs = vec![
+            Message {
+                cc_id: CrossChainId {
+                    message_id: "id1".try_into().unwrap(),
+                    source_chain: "chain1".try_into().unwrap(),
+                },
+                source_address: "source-address".parse().unwrap(),
+                destination_chain: "destination".parse().unwrap(),
+                destination_address: "destination-address".parse().unwrap(),
+                payload_hash: [1; 32],
+            },
+            Message {
+                cc_id: CrossChainId {
+                    message_id: "id2".try_into().unwrap(),
+                    source_chain: "chain2".try_into().unwrap(),
+                },
+                source_address: "source-address2".parse().unwrap(),
+                destination_chain: "destination2".parse().unwrap(),
+                destination_address: "destination-address2".parse().unwrap(),
+                payload_hash: [2; 32],
+            },
+            Message {
+                cc_id: CrossChainId {
+                    message_id: "id3".try_into().unwrap(),
+                    source_chain: "chain3".try_into().unwrap(),
+                },
+                source_address: "source-address3".parse().unwrap(),
+                destination_chain: "destination3".parse().unwrap(),
+                destination_address: "destination-address3".parse().unwrap(),
+                payload_hash: [3; 32],
+            },
+        ];
+
+        let payload = payload::Payload::Messages(msgs);
+
+        state::PAYLOAD
+            .save(deps.as_mut().storage, &payload.id(), &payload)
+            .unwrap();
+
+        assert!(v0_6_0::migrate(deps.as_mut().storage).is_ok());
+
+        assert!(state::PAYLOAD.is_empty(deps.as_ref().storage));
+    }
+
     #[test]
     fn migrate_permission_control() {
         let mut deps = mock_dependencies();
diff --git a/contracts/nexus-gateway/src/contract.rs b/contracts/nexus-gateway/src/contract.rs
index 2da129fc4..622d2efa2 100644
--- a/contracts/nexus-gateway/src/contract.rs
+++ b/contracts/nexus-gateway/src/contract.rs
@@ -275,8 +275,8 @@ mod tests {
         let msgs = vec![
             router_api::Message {
                 cc_id: CrossChainId {
-                    chain: "sourceChain".parse().unwrap(),
-                    id: "0x2fe4:0".parse().unwrap(),
+                    source_chain: "sourceChain".parse().unwrap(),
+                    message_id: "0x2fe4:0".parse().unwrap(),
                 },
                 source_address: "0xb860".parse().unwrap(),
                 destination_address: "0xD419".parse().unwrap(),
@@ -290,8 +290,8 @@ mod tests {
             },
             router_api::Message {
                 cc_id: CrossChainId {
-                    chain: "sourceChain".parse().unwrap(),
-                    id: "0x6b33:10".parse().unwrap(),
+                    source_chain: "sourceChain".parse().unwrap(),
+                    message_id: "0x6b33:10".parse().unwrap(),
                 },
                 source_address: "0x70725".parse().unwrap(),
                 destination_address: "0x7FAD".parse().unwrap(),
diff --git a/contracts/nexus-gateway/src/nexus.rs b/contracts/nexus-gateway/src/nexus.rs
index 6f6fb7c1b..32f509f8e 100644
--- a/contracts/nexus-gateway/src/nexus.rs
+++ b/contracts/nexus-gateway/src/nexus.rs
@@ -41,17 +41,17 @@ impl From<router_api::Message> for Message {
     fn from(msg: router_api::Message) -> Self {
         // fallback to using all 0's as the tx ID if it's not in the expected format
         let (source_tx_id, source_tx_index) =
-            parse_message_id(&msg.cc_id.id).unwrap_or((vec![0; 32].try_into().unwrap(), 0));
+            parse_message_id(&msg.cc_id.message_id).unwrap_or((vec![0; 32].try_into().unwrap(), 0));
 
         Self {
-            source_chain: msg.cc_id.chain,
+            source_chain: msg.cc_id.source_chain,
             source_address: msg.source_address,
             destination_chain: msg.destination_chain,
             destination_address: msg.destination_address,
             payload_hash: msg.payload_hash,
             source_tx_id,
             source_tx_index,
-            id: msg.cc_id.id.into(),
+            id: msg.cc_id.message_id.into(),
         }
     }
 }
@@ -62,8 +62,8 @@ impl TryFrom<Message> for router_api::Message {
     fn try_from(msg: Message) -> Result<Self, ContractError> {
         Ok(Self {
             cc_id: CrossChainId {
-                chain: msg.source_chain,
-                id: nonempty::String::try_from(msg.id.as_str())
+                source_chain: msg.source_chain,
+                message_id: nonempty::String::try_from(msg.id.as_str())
                     .change_context(ContractError::InvalidMessageId(msg.id))?,
             },
             source_address: msg.source_address,
@@ -110,8 +110,8 @@ mod test {
         assert!(router_msg.is_ok());
         let router_msg = router_msg.unwrap();
         let router_msg_cc_id = router_msg.cc_id;
-        assert_eq!(router_msg_cc_id.chain, msg.source_chain);
-        assert_eq!(router_msg_cc_id.id.to_string(), msg.id);
+        assert_eq!(router_msg_cc_id.source_chain, msg.source_chain);
+        assert_eq!(router_msg_cc_id.message_id.to_string(), msg.id);
     }
 
     #[test]
@@ -137,11 +137,14 @@ mod test {
 
         let router_msg_cc_id = msg.cc_id;
 
-        assert_eq!(nexus_msg.id, *router_msg_cc_id.id);
+        assert_eq!(nexus_msg.id, *router_msg_cc_id.message_id);
         assert_eq!(nexus_msg.destination_address, msg.destination_address);
         assert_eq!(nexus_msg.destination_chain, msg.destination_chain);
         assert_eq!(nexus_msg.source_address, msg.source_address);
-        assert_eq!(nexus_msg.source_chain, router_msg_cc_id.chain.clone());
+        assert_eq!(
+            nexus_msg.source_chain,
+            router_msg_cc_id.source_chain.clone()
+        );
         assert_eq!(nexus_msg.source_tx_id, vec![2; 32].try_into().unwrap());
         assert_eq!(nexus_msg.source_tx_index, 1);
     }
@@ -169,13 +172,16 @@ mod test {
 
         let router_msg_cc_id = msg.cc_id;
 
-        assert_eq!(nexus_msg.id, *router_msg_cc_id.id);
+        assert_eq!(nexus_msg.id, *router_msg_cc_id.message_id);
         assert_eq!(nexus_msg.source_tx_id, vec![0; 32].try_into().unwrap());
         assert_eq!(nexus_msg.source_tx_index, 0);
 
         assert_eq!(nexus_msg.destination_address, msg.destination_address);
         assert_eq!(nexus_msg.destination_chain, msg.destination_chain);
         assert_eq!(nexus_msg.source_address, msg.source_address);
-        assert_eq!(nexus_msg.source_chain, router_msg_cc_id.chain.clone());
+        assert_eq!(
+            nexus_msg.source_chain,
+            router_msg_cc_id.source_chain.clone()
+        );
     }
 }
diff --git a/contracts/router/src/contract.rs b/contracts/router/src/contract.rs
index 0f7156795..c4b139055 100644
--- a/contracts/router/src/contract.rs
+++ b/contracts/router/src/contract.rs
@@ -331,7 +331,7 @@ mod test {
         let mut messages = generate_messages(&eth, &polygon, &mut 0, 1);
         messages
             .iter_mut()
-            .for_each(|msg| msg.cc_id.chain = "Ethereum".parse().unwrap());
+            .for_each(|msg| msg.cc_id.source_chain = "Ethereum".parse().unwrap());
 
         let result = execute(
             deps.as_mut(),
@@ -354,7 +354,7 @@ mod test {
         let mut messages = generate_messages(&eth, &polygon, &mut 0, 1);
         messages
             .iter_mut()
-            .for_each(|msg| msg.cc_id.chain = "Ethereum".parse().unwrap());
+            .for_each(|msg| msg.cc_id.source_chain = "Ethereum".parse().unwrap());
 
         let result = execute(
             deps.as_mut(),
@@ -426,7 +426,7 @@ mod test {
                         .unwrap()
                         .clone()
                         .into_iter()
-                        .filter(|m| m.cc_id.chain == s.chain_name)
+                        .filter(|m| m.cc_id.source_chain == s.chain_name)
                         .collect::<Vec<_>>(),
                     &res.messages[i].msg,
                 );
diff --git a/contracts/router/src/contract/execute.rs b/contracts/router/src/contract/execute.rs
index 4ca2b9bbf..c31016b57 100644
--- a/contracts/router/src/contract/execute.rs
+++ b/contracts/router/src/contract/execute.rs
@@ -153,7 +153,7 @@ fn verify_msg_ids(
     expected_format: &MessageIdFormat,
 ) -> Result<(), error_stack::Report<Error>> {
     msgs.iter()
-        .try_for_each(|msg| msg_id::verify_msg_id(&msg.cc_id.id, expected_format))
+        .try_for_each(|msg| msg_id::verify_msg_id(&msg.cc_id.message_id, expected_format))
         .change_context(Error::InvalidMessageId)
 }
 
@@ -179,7 +179,10 @@ fn validate_msgs(
         }));
     }
 
-    if msgs.iter().any(|msg| msg.cc_id.chain != source_chain.name) {
+    if msgs
+        .iter()
+        .any(|msg| msg.cc_id.source_chain != source_chain.name)
+    {
         return Err(report!(Error::WrongSourceChain));
     }
 
diff --git a/contracts/voting-verifier/src/contract.rs b/contracts/voting-verifier/src/contract.rs
index 8259e10f7..bfe20eb50 100644
--- a/contracts/voting-verifier/src/contract.rs
+++ b/contracts/voting-verifier/src/contract.rs
@@ -317,7 +317,7 @@ mod test {
         let err = execute(deps.as_mut(), mock_env(), mock_info(SENDER, &[]), msg).unwrap_err();
         assert_contract_err_strings_equal(
             err,
-            ContractError::InvalidMessageID(messages[0].cc_id.id.to_string()),
+            ContractError::InvalidMessageID(messages[0].cc_id.message_id.to_string()),
         );
     }
 
@@ -333,7 +333,7 @@ mod test {
         let err = execute(deps.as_mut(), mock_env(), mock_info(SENDER, &[]), msg).unwrap_err();
         assert_contract_err_strings_equal(
             err,
-            ContractError::InvalidMessageID(messages[0].cc_id.id.to_string()),
+            ContractError::InvalidMessageID(messages[0].cc_id.message_id.to_string()),
         );
     }
 
diff --git a/contracts/voting-verifier/src/contract/execute.rs b/contracts/voting-verifier/src/contract/execute.rs
index 41c76dc85..e2e2155bf 100644
--- a/contracts/voting-verifier/src/contract/execute.rs
+++ b/contracts/voting-verifier/src/contract/execute.rs
@@ -90,7 +90,7 @@ pub fn verify_messages(
 
     if messages
         .iter()
-        .any(|message| message.cc_id.chain != source_chain)
+        .any(|message| message.cc_id.source_chain != source_chain)
     {
         Err(ContractError::SourceChainMismatch(source_chain.clone()))?;
     }
diff --git a/contracts/voting-verifier/src/contract/migrations/v0_5_0.rs b/contracts/voting-verifier/src/contract/migrations/v0_5_0.rs
index 1cee2ac84..0a7a90651 100644
--- a/contracts/voting-verifier/src/contract/migrations/v0_5_0.rs
+++ b/contracts/voting-verifier/src/contract/migrations/v0_5_0.rs
@@ -20,6 +20,8 @@ pub fn migrate(storage: &mut dyn Storage) -> Result<(), ContractError> {
     migrate_permission_control(storage, &config.governance)?;
     migrate_config(storage, config)?;
 
+    delete_polls(storage);
+
     cw2::set_contract_version(storage, CONTRACT_NAME, CONTRACT_VERSION)?;
 
     Ok(())
@@ -50,6 +52,13 @@ fn migrate_permission_control(storage: &mut dyn Storage, governance: &Addr) -> S
     permission_control::set_governance(storage, governance)
 }
 
+fn delete_polls(storage: &mut dyn Storage) {
+    state::POLLS.clear(storage);
+    state::VOTES.clear(storage);
+    state::poll_messages().clear(storage);
+    state::poll_messages().clear(storage);
+}
+
 #[cw_serde]
 #[deprecated(since = "0.5.0", note = "only used during migration")]
 pub struct Config {
@@ -163,6 +172,19 @@ mod tests {
         .contains(Permission::Governance));
     }
 
+    #[test]
+    fn state_is_cleared_after_migration() {
+        let mut deps = mock_dependencies();
+        instantiate_contract(deps.as_mut());
+
+        assert!(v0_5_0::migrate(deps.as_mut().storage).is_ok());
+
+        assert!(state::VOTES.is_empty(deps.as_ref().storage));
+        assert!(state::POLLS.is_empty(deps.as_ref().storage));
+        assert!(state::poll_messages().is_empty(deps.as_ref().storage));
+        assert!(state::poll_verifier_sets().is_empty(deps.as_ref().storage));
+    }
+
     fn instantiate_contract(deps: DepsMut) {
         instantiate(
             deps,
diff --git a/contracts/voting-verifier/src/events.rs b/contracts/voting-verifier/src/events.rs
index 26215bf1e..a82fc5a0c 100644
--- a/contracts/voting-verifier/src/events.rs
+++ b/contracts/voting-verifier/src/events.rs
@@ -195,7 +195,7 @@ pub struct TxEventConfirmation {
 impl TryFrom<(Message, &MessageIdFormat)> for TxEventConfirmation {
     type Error = ContractError;
     fn try_from((msg, msg_id_format): (Message, &MessageIdFormat)) -> Result<Self, Self::Error> {
-        let (tx_id, event_index) = parse_message_id(&msg.cc_id.id, msg_id_format)?;
+        let (tx_id, event_index) = parse_message_id(&msg.cc_id.message_id, msg_id_format)?;
 
         Ok(TxEventConfirmation {
             tx_id,
diff --git a/packages/evm-gateway/src/lib.rs b/packages/evm-gateway/src/lib.rs
index b022e9f72..5354a7c6c 100644
--- a/packages/evm-gateway/src/lib.rs
+++ b/packages/evm-gateway/src/lib.rs
@@ -82,8 +82,8 @@ impl TryFrom<&RouterMessage> for Message {
             .change_context(Error::InvalidAddress)?;
 
         Ok(Message {
-            source_chain: msg.cc_id.chain.to_string(),
-            message_id: msg.cc_id.id.to_string(),
+            source_chain: msg.cc_id.source_chain.to_string(),
+            message_id: msg.cc_id.message_id.to_string(),
             source_address: msg.source_address.to_string(),
             contract_address,
             payload_hash: msg.payload_hash,
diff --git a/packages/router-api/src/primitives.rs b/packages/router-api/src/primitives.rs
index f9f55e0bf..6014d5759 100644
--- a/packages/router-api/src/primitives.rs
+++ b/packages/router-api/src/primitives.rs
@@ -62,8 +62,8 @@ impl Message {
 impl From<Message> for Vec<Attribute> {
     fn from(other: Message) -> Self {
         vec![
-            ("id", other.cc_id.id).into(),
-            ("source_chain", other.cc_id.chain).into(),
+            ("message_id", other.cc_id.message_id).into(),
+            ("source_chain", other.cc_id.source_chain).into(),
             ("source_address", other.source_address.deref()).into(),
             ("destination_chain", other.destination_chain).into(),
             ("destination_address", other.destination_address.deref()).into(),
@@ -116,8 +116,8 @@ impl TryFrom<String> for Address {
 #[cw_serde]
 #[derive(Eq, Hash)]
 pub struct CrossChainId {
-    pub chain: ChainNameRaw,
-    pub id: nonempty::String,
+    pub source_chain: ChainNameRaw,
+    pub message_id: nonempty::String,
 }
 
 impl CrossChainId {
@@ -130,8 +130,8 @@ impl CrossChainId {
         T: Context,
     {
         Ok(CrossChainId {
-            chain: chain.try_into().change_context(Error::InvalidChainName)?,
-            id: id.try_into().change_context(Error::InvalidMessageId)?,
+            source_chain: chain.try_into().change_context(Error::InvalidChainName)?,
+            message_id: id.try_into().change_context(Error::InvalidMessageId)?,
         })
     }
 }
@@ -143,8 +143,8 @@ impl PrimaryKey<'_> for CrossChainId {
     type SuperSuffix = (ChainNameRaw, String);
 
     fn key(&self) -> Vec<Key> {
-        let mut keys = self.chain.key();
-        keys.extend(self.id.key());
+        let mut keys = self.source_chain.key();
+        keys.extend(self.message_id.key());
         keys
     }
 }
@@ -153,10 +153,10 @@ impl KeyDeserialize for CrossChainId {
     type Output = Self;
 
     fn from_vec(value: Vec<u8>) -> StdResult<Self::Output> {
-        let (chain, id) = <(ChainNameRaw, String)>::from_vec(value)?;
+        let (source_chain, id) = <(ChainNameRaw, String)>::from_vec(value)?;
         Ok(CrossChainId {
-            chain,
-            id: id
+            source_chain,
+            message_id: id
                 .try_into()
                 .map_err(|err| StdError::parse_err(type_name::<nonempty::String>(), err))?,
         })
@@ -164,7 +164,11 @@ impl KeyDeserialize for CrossChainId {
 }
 impl Display for CrossChainId {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}{}{}", self.chain, FIELD_DELIMITER, *self.id)
+        write!(
+            f,
+            "{}{}{}",
+            self.source_chain, FIELD_DELIMITER, *self.message_id
+        )
     }
 }
 
@@ -444,7 +448,7 @@ mod tests {
     // will cause this test to fail, indicating that a migration is needed.
     fn test_message_struct_unchanged() {
         let expected_message_hash =
-            "b0c6ee811cf4c205b08e36dbbad956212c4e291aedae44ab700265477bfea526";
+            "3a0edbeb590d12cf9f71864469d9e7afd52cccf2798db09c55def296af3a8e89";
 
         let msg = dummy_message();