diff --git a/app/keepers.go b/app/keepers.go
index 2b9803afa..ee465ab03 100644
--- a/app/keepers.go
+++ b/app/keepers.go
@@ -2,8 +2,6 @@ package app
 
 import (
 	"fmt"
-	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
-	"github.com/axelarnetwork/axelar-core/x/ante"
 	"reflect"
 	"strings"
 
@@ -168,8 +166,10 @@ func initWasmKeeper(encodingConfig axelarParams.EncodingConfig, keys map[string]
 	// if we want to allow any custom callbacks
 	wasmOpts = append(wasmOpts, wasmkeeper.WithMessageHandlerDecorator(
 		func(old wasmkeeper.Messenger) wasmkeeper.Messenger {
-			return withAnteChecks(
-				wasm.DefaultEncoders(), // todo add custom encoder
+			encoders := wasm.DefaultEncoders(encodingConfig.Codec, getKeeper[ibctransferkeeper.Keeper](keepers))
+			encoders.Custom = nexusKeeper.EncodeRoutingMessage
+			return withAnteHandlers(
+				encoders,
 				initMessageAnteDecorators(encodingConfig, keepers),
 				wasmkeeper.NewMessageHandlerChain(old, nexusKeeper.NewMessenger(getKeeper[nexusKeeper.Keeper](keepers))))
 		}))
@@ -200,33 +200,6 @@ func initWasmKeeper(encodingConfig axelarParams.EncodingConfig, keys map[string]
 	return &wasmK
 }
 
-type Messenger struct {
-	anteHandle ante.MessageAnteHandler
-	encoders   wasm.MessageEncoders
-	messenger  wasmkeeper.Messenger
-}
-
-func (m Messenger) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAddress, contractIBCPortID string, msg wasmvmtypes.CosmosMsg) (events []sdk.Event, data [][]byte, err error) {
-	sdkMsgs, err := m.encoders.Encode(ctx, contractAddr, contractIBCPortID, msg)
-	if err != nil {
-		return nil, nil, err
-	}
-	ctx, err = m.anteHandle(ctx, sdkMsgs, false) //todo: how do I get the simulate boolean?
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return m.messenger.DispatchMsg(ctx, contractAddr, contractIBCPortID, msg)
-}
-
-func withAnteChecks(encoders wasmkeeper.MessageEncoders, anteHandler ante.MessageAnteHandler, messenger wasmkeeper.Messenger) wasmkeeper.Messenger {
-	return Messenger{
-		encoders:   encoders,
-		anteHandle: anteHandler,
-		messenger:  messenger,
-	}
-}
-
 func initGovernanceKeeper(appCodec codec.Codec, keys map[string]*sdk.KVStoreKey, keepers *keeperCache) *govkeeper.Keeper {
 	// Add governance proposal hooks
 	govRouter := govtypes.NewRouter()
diff --git a/app/wasm.go b/app/wasm.go
new file mode 100644
index 000000000..aec504cb3
--- /dev/null
+++ b/app/wasm.go
@@ -0,0 +1,38 @@
+package app
+
+import (
+	"github.com/CosmWasm/wasmd/x/wasm"
+	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
+	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
+	"github.com/axelarnetwork/axelar-core/x/ante"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+)
+
+type AnteHandlerMessenger struct {
+	anteHandle ante.MessageAnteHandler
+	encoders   wasm.MessageEncoders
+	messenger  wasmkeeper.Messenger
+}
+
+func (m AnteHandlerMessenger) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAddress, contractIBCPortID string, msg wasmvmtypes.CosmosMsg) (events []sdk.Event, data [][]byte, err error) {
+	sdkMsgs, err := m.encoders.Encode(ctx, contractAddr, contractIBCPortID, msg)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	// we can't know if this is a simulation or not at this stage, so we treat it as a regular execution
+	ctx, err = m.anteHandle(ctx, sdkMsgs, false)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return m.messenger.DispatchMsg(ctx, contractAddr, contractIBCPortID, msg)
+}
+
+func withAnteHandlers(encoders wasmkeeper.MessageEncoders, anteHandler ante.MessageAnteHandler, messenger wasmkeeper.Messenger) wasmkeeper.Messenger {
+	return AnteHandlerMessenger{
+		encoders:   encoders,
+		anteHandle: anteHandler,
+		messenger:  messenger,
+	}
+}
diff --git a/docs/proto/proto-docs.md b/docs/proto/proto-docs.md
index 1f7b79e6d..0bf73eefd 100644
--- a/docs/proto/proto-docs.md
+++ b/docs/proto/proto-docs.md
@@ -1343,6 +1343,7 @@ TransferFee represents accumulated fees generated by the network
 | `payload_hash` | [bytes](#bytes) |  |  |
 | `source_tx_id` | [bytes](#bytes) |  |  |
 | `source_tx_index` | [uint64](#uint64) |  |  |
+| `sender` | [bytes](#bytes) |  |  |
 
 
 
diff --git a/proto/axelar/nexus/exported/v1beta1/types.proto b/proto/axelar/nexus/exported/v1beta1/types.proto
index d787f748b..d49a44d13 100644
--- a/proto/axelar/nexus/exported/v1beta1/types.proto
+++ b/proto/axelar/nexus/exported/v1beta1/types.proto
@@ -118,4 +118,6 @@ message WasmMessage {
   bytes payload_hash = 5;
   bytes source_tx_id = 6 [ (gogoproto.customname) = "SourceTxID" ];
   uint64 source_tx_index = 7;
+  bytes sender = 8 [ (gogoproto.casttype) =
+                         "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
 }
diff --git a/third_party/proto/cosmwasm/wasm/v1/authz.proto b/third_party/proto/cosmwasm/wasm/v1/authz.proto
index 96ecbfb38..97a82275d 100644
--- a/third_party/proto/cosmwasm/wasm/v1/authz.proto
+++ b/third_party/proto/cosmwasm/wasm/v1/authz.proto
@@ -12,7 +12,8 @@ option (gogoproto.goproto_getters_all) = false;
 // ContractExecutionAuthorization defines authorization for wasm execute.
 // Since: wasmd 0.30
 message ContractExecutionAuthorization {
-  option (cosmos_proto.implements_interface) = "Authorization";
+  option (cosmos_proto.implements_interface) =
+      "cosmos.authz.v1beta1.Authorization";
 
   // Grants for contract executions
   repeated ContractGrant grants = 1 [ (gogoproto.nullable) = false ];
@@ -21,7 +22,8 @@ message ContractExecutionAuthorization {
 // ContractMigrationAuthorization defines authorization for wasm contract
 // migration. Since: wasmd 0.30
 message ContractMigrationAuthorization {
-  option (cosmos_proto.implements_interface) = "Authorization";
+  option (cosmos_proto.implements_interface) =
+      "cosmos.authz.v1beta1.Authorization";
 
   // Grants for contract migrations
   repeated ContractGrant grants = 1 [ (gogoproto.nullable) = false ];
@@ -35,20 +37,22 @@ message ContractGrant {
 
   // Limit defines execution limits that are enforced and updated when the grant
   // is applied. When the limit lapsed the grant is removed.
-  google.protobuf.Any limit = 2
-      [ (cosmos_proto.accepts_interface) = "ContractAuthzLimitX" ];
+  google.protobuf.Any limit = 2 [ (cosmos_proto.accepts_interface) =
+                                      "cosmwasm.wasm.v1.ContractAuthzLimitX" ];
 
   // Filter define more fine-grained control on the message payload passed
   // to the contract in the operation. When no filter applies on execution, the
   // operation is prohibited.
   google.protobuf.Any filter = 3
-      [ (cosmos_proto.accepts_interface) = "ContractAuthzFilterX" ];
+      [ (cosmos_proto.accepts_interface) =
+            "cosmwasm.wasm.v1.ContractAuthzFilterX" ];
 }
 
 // MaxCallsLimit limited number of calls to the contract. No funds transferable.
 // Since: wasmd 0.30
 message MaxCallsLimit {
-  option (cosmos_proto.implements_interface) = "ContractAuthzLimitX";
+  option (cosmos_proto.implements_interface) =
+      "cosmwasm.wasm.v1.ContractAuthzLimitX";
 
   // Remaining number that is decremented on each execution
   uint64 remaining = 1;
@@ -57,7 +61,8 @@ message MaxCallsLimit {
 // MaxFundsLimit defines the maximal amounts that can be sent to the contract.
 // Since: wasmd 0.30
 message MaxFundsLimit {
-  option (cosmos_proto.implements_interface) = "ContractAuthzLimitX";
+  option (cosmos_proto.implements_interface) =
+      "cosmwasm.wasm.v1.ContractAuthzLimitX";
 
   // Amounts is the maximal amount of tokens transferable to the contract.
   repeated cosmos.base.v1beta1.Coin amounts = 1 [
@@ -70,7 +75,8 @@ message MaxFundsLimit {
 // the maximal number of calls executable. Both need to remain >0 to be valid.
 // Since: wasmd 0.30
 message CombinedLimit {
-  option (cosmos_proto.implements_interface) = "ContractAuthzLimitX";
+  option (cosmos_proto.implements_interface) =
+      "cosmwasm.wasm.v1.ContractAuthzLimitX";
 
   // Remaining number that is decremented on each execution
   uint64 calls_remaining = 1;
@@ -85,14 +91,16 @@ message CombinedLimit {
 // message.
 // Since: wasmd 0.30
 message AllowAllMessagesFilter {
-  option (cosmos_proto.implements_interface) = "ContractAuthzFilterX";
+  option (cosmos_proto.implements_interface) =
+      "cosmwasm.wasm.v1.ContractAuthzFilterX";
 }
 
 // AcceptedMessageKeysFilter accept only the specific contract message keys in
 // the json object to be executed.
 // Since: wasmd 0.30
 message AcceptedMessageKeysFilter {
-  option (cosmos_proto.implements_interface) = "ContractAuthzFilterX";
+  option (cosmos_proto.implements_interface) =
+      "cosmwasm.wasm.v1.ContractAuthzFilterX";
 
   // Messages is the list of unique keys
   repeated string keys = 1;
@@ -102,7 +110,8 @@ message AcceptedMessageKeysFilter {
 // executed.
 // Since: wasmd 0.30
 message AcceptedMessagesFilter {
-  option (cosmos_proto.implements_interface) = "ContractAuthzFilterX";
+  option (cosmos_proto.implements_interface) =
+      "cosmwasm.wasm.v1.ContractAuthzFilterX";
 
   // Messages is the list of raw contract messages
   repeated bytes messages = 1 [ (gogoproto.casttype) = "RawContractMessage" ];
diff --git a/third_party/proto/cosmwasm/wasm/v1/genesis.proto b/third_party/proto/cosmwasm/wasm/v1/genesis.proto
index b7622c206..4e728ff4b 100644
--- a/third_party/proto/cosmwasm/wasm/v1/genesis.proto
+++ b/third_party/proto/cosmwasm/wasm/v1/genesis.proto
@@ -3,7 +3,6 @@ package cosmwasm.wasm.v1;
 
 import "gogoproto/gogo.proto";
 import "cosmwasm/wasm/v1/types.proto";
-import "cosmwasm/wasm/v1/tx.proto";
 
 option go_package = "github.com/CosmWasm/wasmd/x/wasm/types";
 
@@ -20,23 +19,6 @@ message GenesisState {
     (gogoproto.nullable) = false,
     (gogoproto.jsontag) = "sequences,omitempty"
   ];
-  repeated GenMsgs gen_msgs = 5 [
-    (gogoproto.nullable) = false,
-    (gogoproto.jsontag) = "gen_msgs,omitempty"
-  ];
-
-  // GenMsgs define the messages that can be executed during genesis phase in
-  // order. The intention is to have more human readable data that is auditable.
-  message GenMsgs {
-    // sum is a single message
-    oneof sum {
-      MsgStoreCode store_code = 1;
-      MsgInstantiateContract instantiate_contract = 2;
-      MsgExecuteContract execute_contract = 3;
-      // MsgInstantiateContract2 intentionally not supported
-      // see https://github.com/CosmWasm/wasmd/issues/987
-    }
-  }
 }
 
 // Code struct encompasses CodeInfo and CodeBytes
diff --git a/third_party/proto/cosmwasm/wasm/v1/ibc.proto b/third_party/proto/cosmwasm/wasm/v1/ibc.proto
index d880a7078..feaad2936 100644
--- a/third_party/proto/cosmwasm/wasm/v1/ibc.proto
+++ b/third_party/proto/cosmwasm/wasm/v1/ibc.proto
@@ -25,6 +25,12 @@ message MsgIBCSend {
   bytes data = 6;
 }
 
+// MsgIBCSendResponse
+message MsgIBCSendResponse {
+  // Sequence number of the IBC packet sent
+  uint64 sequence = 1;
+}
+
 // MsgIBCCloseChannel port and channel need to be owned by the contract
 message MsgIBCCloseChannel {
   string channel = 2 [ (gogoproto.moretags) = "yaml:\"source_channel\"" ];
diff --git a/third_party/proto/cosmwasm/wasm/v1/proposal.proto b/third_party/proto/cosmwasm/wasm/v1/proposal.proto
index b8a143b67..b1c484bc9 100644
--- a/third_party/proto/cosmwasm/wasm/v1/proposal.proto
+++ b/third_party/proto/cosmwasm/wasm/v1/proposal.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
 package cosmwasm.wasm.v1;
 
 import "gogoproto/gogo.proto";
+import "cosmos_proto/cosmos.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "cosmwasm/wasm/v1/types.proto";
 
@@ -12,6 +13,8 @@ option (gogoproto.equal_all) = true;
 
 // StoreCodeProposal gov proposal content type to submit WASM code to the system
 message StoreCodeProposal {
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
+
   // Title is a short summary
   string title = 1;
   // Description is a human readable text
@@ -39,6 +42,8 @@ message StoreCodeProposal {
 // InstantiateContractProposal gov proposal content type to instantiate a
 // contract.
 message InstantiateContractProposal {
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
+
   // Title is a short summary
   string title = 1;
   // Description is a human readable text
@@ -60,8 +65,41 @@ message InstantiateContractProposal {
   ];
 }
 
+// InstantiateContract2Proposal gov proposal content type to instantiate
+// contract 2
+message InstantiateContract2Proposal {
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
+
+  // Title is a short summary
+  string title = 1;
+  // Description is a human readable text
+  string description = 2;
+  // RunAs is the address that is passed to the contract's enviroment as sender
+  string run_as = 3;
+  // Admin is an optional address that can execute migrations
+  string admin = 4;
+  // CodeID is the reference to the stored WASM code
+  uint64 code_id = 5 [ (gogoproto.customname) = "CodeID" ];
+  // Label is optional metadata to be stored with a constract instance.
+  string label = 6;
+  // Msg json encode message to be passed to the contract on instantiation
+  bytes msg = 7 [ (gogoproto.casttype) = "RawContractMessage" ];
+  // Funds coins that are transferred to the contract on instantiation
+  repeated cosmos.base.v1beta1.Coin funds = 8 [
+    (gogoproto.nullable) = false,
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
+  // Salt is an arbitrary value provided by the sender. Size can be 1 to 64.
+  bytes salt = 9;
+  // FixMsg include the msg value into the hash for the predictable address.
+  // Default is false
+  bool fix_msg = 10;
+}
+
 // MigrateContractProposal gov proposal content type to migrate a contract.
 message MigrateContractProposal {
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
+
   // Title is a short summary
   string title = 1;
   // Description is a human readable text
@@ -78,6 +116,8 @@ message MigrateContractProposal {
 
 // SudoContractProposal gov proposal content type to call sudo on a contract.
 message SudoContractProposal {
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
+
   // Title is a short summary
   string title = 1;
   // Description is a human readable text
@@ -91,6 +131,8 @@ message SudoContractProposal {
 // ExecuteContractProposal gov proposal content type to call execute on a
 // contract.
 message ExecuteContractProposal {
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
+
   // Title is a short summary
   string title = 1;
   // Description is a human readable text
@@ -110,6 +152,8 @@ message ExecuteContractProposal {
 
 // UpdateAdminProposal gov proposal content type to set an admin for a contract.
 message UpdateAdminProposal {
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
+
   // Title is a short summary
   string title = 1;
   // Description is a human readable text
@@ -123,6 +167,8 @@ message UpdateAdminProposal {
 // ClearAdminProposal gov proposal content type to clear the admin of a
 // contract.
 message ClearAdminProposal {
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
+
   // Title is a short summary
   string title = 1;
   // Description is a human readable text
@@ -134,6 +180,8 @@ message ClearAdminProposal {
 // PinCodesProposal gov proposal content type to pin a set of code ids in the
 // wasmvm cache.
 message PinCodesProposal {
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
+
   // Title is a short summary
   string title = 1 [ (gogoproto.moretags) = "yaml:\"title\"" ];
   // Description is a human readable text
@@ -148,6 +196,8 @@ message PinCodesProposal {
 // UnpinCodesProposal gov proposal content type to unpin a set of code ids in
 // the wasmvm cache.
 message UnpinCodesProposal {
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
+
   // Title is a short summary
   string title = 1 [ (gogoproto.moretags) = "yaml:\"title\"" ];
   // Description is a human readable text
@@ -171,6 +221,8 @@ message AccessConfigUpdate {
 // UpdateInstantiateConfigProposal gov proposal content type to update
 // instantiate config to a  set of code ids.
 message UpdateInstantiateConfigProposal {
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
+
   // Title is a short summary
   string title = 1 [ (gogoproto.moretags) = "yaml:\"title\"" ];
   // Description is a human readable text
@@ -184,6 +236,8 @@ message UpdateInstantiateConfigProposal {
 // StoreAndInstantiateContractProposal gov proposal content type to store
 // and instantiate the contract.
 message StoreAndInstantiateContractProposal {
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
+
   // Title is a short summary
   string title = 1;
   // Description is a human readable text
diff --git a/third_party/proto/cosmwasm/wasm/v1/tx.proto b/third_party/proto/cosmwasm/wasm/v1/tx.proto
index 04acc8ef7..741fbc494 100644
--- a/third_party/proto/cosmwasm/wasm/v1/tx.proto
+++ b/third_party/proto/cosmwasm/wasm/v1/tx.proto
@@ -28,11 +28,14 @@ service Msg {
   rpc UpdateAdmin(MsgUpdateAdmin) returns (MsgUpdateAdminResponse);
   // ClearAdmin removes any admin stored for a smart contract
   rpc ClearAdmin(MsgClearAdmin) returns (MsgClearAdminResponse);
+  // UpdateInstantiateConfig updates instantiate config for a smart contract
+  rpc UpdateInstantiateConfig(MsgUpdateInstantiateConfig)
+      returns (MsgUpdateInstantiateConfigResponse);
 }
 
 // MsgStoreCode submit Wasm code to the system
 message MsgStoreCode {
-  // Sender is the that actor that signed the messages
+  // Sender is the actor that signed the messages
   string sender = 1;
   // WASMByteCode can be raw or gzip compressed
   bytes wasm_byte_code = 2 [ (gogoproto.customname) = "WASMByteCode" ];
@@ -166,7 +169,7 @@ message MsgUpdateAdminResponse {}
 
 // MsgClearAdmin removes any admin stored for a smart contract
 message MsgClearAdmin {
-  // Sender is the that actor that signed the messages
+  // Sender is the actor that signed the messages
   string sender = 1;
   // Contract is the address of the smart contract
   string contract = 3;
@@ -174,3 +177,16 @@ message MsgClearAdmin {
 
 // MsgClearAdminResponse returns empty data
 message MsgClearAdminResponse {}
+
+// MsgUpdateInstantiateConfig updates instantiate config for a smart contract
+message MsgUpdateInstantiateConfig {
+  // Sender is the that actor that signed the messages
+  string sender = 1;
+  // CodeID references the stored WASM code
+  uint64 code_id = 2 [ (gogoproto.customname) = "CodeID" ];
+  // NewInstantiatePermission is the new access control
+  AccessConfig new_instantiate_permission = 3;
+}
+
+// MsgUpdateInstantiateConfigResponse returns empty data
+message MsgUpdateInstantiateConfigResponse {}
\ No newline at end of file
diff --git a/third_party/proto/cosmwasm/wasm/v1/types.proto b/third_party/proto/cosmwasm/wasm/v1/types.proto
index 216b24e3b..b68179e2e 100644
--- a/third_party/proto/cosmwasm/wasm/v1/types.proto
+++ b/third_party/proto/cosmwasm/wasm/v1/types.proto
@@ -90,7 +90,8 @@ message ContractInfo {
   // Extension is an extension point to store custom metadata within the
   // persistence model.
   google.protobuf.Any extension = 7
-      [ (cosmos_proto.accepts_interface) = "ContractInfoExtension" ];
+      [ (cosmos_proto.accepts_interface) =
+            "cosmwasm.wasm.v1.ContractInfoExtension" ];
 }
 
 // ContractCodeHistoryOperationType actions that caused a code change
diff --git a/x/ante/ante.go b/x/ante/ante.go
index fe892651e..e3a3187f3 100644
--- a/x/ante/ante.go
+++ b/x/ante/ante.go
@@ -32,19 +32,31 @@ func (decorator HandlerDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulat
 	return next(newCtx, tx, simulate)
 }
 
+// MessageAnteHandler is analogous to the sdk's AnteHandler, but works on messages instead of the full Tx
 type MessageAnteHandler func(ctx sdk.Context, msgs []sdk.Msg, simulate bool) (sdk.Context, error)
+
+// ToAnteHandler converts a MessageAnteHandler to an AnteHandler
+func (m MessageAnteHandler) ToAnteHandler() sdk.AnteHandler {
+	return func(ctx sdk.Context, tx sdk.Tx, simulate bool) (sdk.Context, error) {
+		msgs := tx.GetMsgs()
+		return m(ctx, msgs, simulate)
+	}
+}
+
+// MessageAnteDecorator is analogous to the sdk's AnteDecorator, but works on messages instead of the full Tx
 type MessageAnteDecorator interface {
 	AnteHandle(ctx sdk.Context, msgs []sdk.Msg, simulate bool, next MessageAnteHandler) (sdk.Context, error)
 }
 
+// ChainMessageAnteDecorators combines multiple MessageAnteDecorators into a single MessageAnteHandler
 func ChainMessageAnteDecorators(chain ...MessageAnteDecorator) MessageAnteHandler {
 	if len(chain) == 0 {
 		return nil
 	}
 
 	// handle non-terminated decorators chain
-	if (chain[len(chain)-1] != Terminator{}) {
-		chain = append(chain, Terminator{})
+	if (chain[len(chain)-1] != terminator{}) {
+		chain = append(chain, terminator{})
 	}
 
 	return func(ctx sdk.Context, msgs []sdk.Msg, simulate bool) (sdk.Context, error) {
@@ -52,15 +64,9 @@ func ChainMessageAnteDecorators(chain ...MessageAnteDecorator) MessageAnteHandle
 	}
 }
 
-type Terminator struct{}
+type terminator struct{}
 
-func (Terminator) AnteHandle(ctx sdk.Context, _ []sdk.Msg, _ bool, _ MessageAnteHandler) (sdk.Context, error) {
+// AnteHandle implements MessageAnteDecorator
+func (terminator) AnteHandle(ctx sdk.Context, _ []sdk.Msg, _ bool, _ MessageAnteHandler) (sdk.Context, error) {
 	return ctx, nil
 }
-
-func (m MessageAnteHandler) ToAnteHandler() sdk.AnteHandler {
-	return func(ctx sdk.Context, tx sdk.Tx, simulate bool) (sdk.Context, error) {
-		msgs := tx.GetMsgs()
-		return m(ctx, msgs, simulate)
-	}
-}
diff --git a/x/nexus/exported/types.go b/x/nexus/exported/types.go
index 95e5b840d..e21e47d2f 100644
--- a/x/nexus/exported/types.go
+++ b/x/nexus/exported/types.go
@@ -349,3 +349,15 @@ func FromGeneralMessage(msg GeneralMessage) WasmMessage {
 		SourceTxIndex:      msg.SourceTxIndex,
 	}
 }
+
+var _ sdk.Msg = &WasmMessage{}
+
+// ValidateBasic implements sdk.Msg
+func (m WasmMessage) ValidateBasic() error {
+	return nil
+}
+
+// GetSigners implements sdk.Msg
+func (m WasmMessage) GetSigners() []sdk.AccAddress {
+	return []sdk.AccAddress{m.Sender}
+}
diff --git a/x/nexus/exported/types.pb.go b/x/nexus/exported/types.pb.go
index 38118cf33..71b37d534 100644
--- a/x/nexus/exported/types.pb.go
+++ b/x/nexus/exported/types.pb.go
@@ -403,13 +403,14 @@ func (m *GeneralMessage) XXX_DiscardUnknown() {
 var xxx_messageInfo_GeneralMessage proto.InternalMessageInfo
 
 type WasmMessage struct {
-	SourceChain        ChainName `protobuf:"bytes,1,opt,name=source_chain,json=sourceChain,proto3,casttype=ChainName" json:"source_chain,omitempty"`
-	SourceAddress      string    `protobuf:"bytes,2,opt,name=source_address,json=sourceAddress,proto3" json:"source_address,omitempty"`
-	DestinationChain   ChainName `protobuf:"bytes,3,opt,name=destination_chain,json=destinationChain,proto3,casttype=ChainName" json:"destination_chain,omitempty"`
-	DestinationAddress string    `protobuf:"bytes,4,opt,name=destination_address,json=destinationAddress,proto3" json:"destination_address,omitempty"`
-	PayloadHash        []byte    `protobuf:"bytes,5,opt,name=payload_hash,json=payloadHash,proto3" json:"payload_hash,omitempty"`
-	SourceTxID         []byte    `protobuf:"bytes,6,opt,name=source_tx_id,json=sourceTxId,proto3" json:"source_tx_id,omitempty"`
-	SourceTxIndex      uint64    `protobuf:"varint,7,opt,name=source_tx_index,json=sourceTxIndex,proto3" json:"source_tx_index,omitempty"`
+	SourceChain        ChainName                                     `protobuf:"bytes,1,opt,name=source_chain,json=sourceChain,proto3,casttype=ChainName" json:"source_chain,omitempty"`
+	SourceAddress      string                                        `protobuf:"bytes,2,opt,name=source_address,json=sourceAddress,proto3" json:"source_address,omitempty"`
+	DestinationChain   ChainName                                     `protobuf:"bytes,3,opt,name=destination_chain,json=destinationChain,proto3,casttype=ChainName" json:"destination_chain,omitempty"`
+	DestinationAddress string                                        `protobuf:"bytes,4,opt,name=destination_address,json=destinationAddress,proto3" json:"destination_address,omitempty"`
+	PayloadHash        []byte                                        `protobuf:"bytes,5,opt,name=payload_hash,json=payloadHash,proto3" json:"payload_hash,omitempty"`
+	SourceTxID         []byte                                        `protobuf:"bytes,6,opt,name=source_tx_id,json=sourceTxId,proto3" json:"source_tx_id,omitempty"`
+	SourceTxIndex      uint64                                        `protobuf:"varint,7,opt,name=source_tx_index,json=sourceTxIndex,proto3" json:"source_tx_index,omitempty"`
+	Sender             github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,8,opt,name=sender,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"sender,omitempty"`
 }
 
 func (m *WasmMessage) Reset()         { *m = WasmMessage{} }
@@ -464,85 +465,86 @@ func init() {
 }
 
 var fileDescriptor_82a7a8692925fe67 = []byte{
-	// 1237 bytes of a gzipped FileDescriptorProto
+	// 1259 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4b, 0x6f, 0x1b, 0x55,
 	0x14, 0xf6, 0xf8, 0x9d, 0xeb, 0x24, 0x75, 0x2e, 0xa5, 0x35, 0x46, 0xb5, 0x5d, 0xd3, 0x47, 0x5a,
-	0x51, 0xbb, 0x0f, 0xca, 0x82, 0x05, 0xe0, 0xd8, 0xe3, 0x74, 0x68, 0x3b, 0xb6, 0xc6, 0x36, 0x20,
-	0x36, 0xd6, 0x64, 0xe6, 0xd8, 0x19, 0x25, 0xbe, 0xd7, 0x9a, 0x3b, 0x2e, 0xce, 0x3f, 0x40, 0x61,
-	0xc3, 0x82, 0x6d, 0x16, 0x08, 0x16, 0x08, 0xf1, 0x27, 0x58, 0xd1, 0x0d, 0x52, 0x97, 0x88, 0x45,
-	0x80, 0xf4, 0x5f, 0x74, 0x85, 0xee, 0x63, 0x6a, 0xc7, 0x8d, 0x1a, 0x88, 0x58, 0x79, 0xee, 0x3d,
-	0xdf, 0xf9, 0xce, 0xeb, 0x3b, 0x33, 0x46, 0x37, 0xec, 0x29, 0xec, 0xda, 0x7e, 0x95, 0xc0, 0x74,
-	0xc2, 0xaa, 0x30, 0x1d, 0x53, 0x3f, 0x00, 0xb7, 0xfa, 0xe4, 0xce, 0x16, 0x04, 0xf6, 0x9d, 0x6a,
-	0xb0, 0x37, 0x06, 0x56, 0x19, 0xfb, 0x34, 0xa0, 0xf8, 0x92, 0x84, 0x56, 0x04, 0xb4, 0x12, 0x42,
-	0x2b, 0x0a, 0x9a, 0x3f, 0x3f, 0xa4, 0x43, 0x2a, 0x90, 0x55, 0xfe, 0x24, 0x9d, 0xf2, 0x05, 0x87,
-	0xb2, 0x11, 0x65, 0xd5, 0x2d, 0x9b, 0xc1, 0x4b, 0x56, 0x87, 0x7a, 0x44, 0xd9, 0xaf, 0xab, 0xf8,
-	0x01, 0x7b, 0x7d, 0xf4, 0xf2, 0x2f, 0x1a, 0x4a, 0xd4, 0xb7, 0x6d, 0x8f, 0xe0, 0xcb, 0x28, 0x4e,
-	0xec, 0x11, 0xe4, 0xb4, 0x92, 0xb6, 0xbe, 0xb4, 0xb1, 0xf2, 0xe2, 0xb0, 0xb8, 0x24, 0x0c, 0xa6,
-	0x3d, 0x02, 0x4b, 0x98, 0xf0, 0xfb, 0xe8, 0x22, 0x9b, 0x8c, 0x39, 0x1b, 0xeb, 0x0f, 0xa8, 0x0f,
-	0xde, 0x90, 0xf4, 0x6d, 0xc6, 0x20, 0x60, 0xb9, 0x58, 0x49, 0x5b, 0x4f, 0x5b, 0x6f, 0x86, 0xe6,
-	0xa6, 0xb4, 0xd6, 0x84, 0x11, 0x7f, 0x84, 0xd2, 0x3b, 0xb0, 0xd7, 0xe7, 0x71, 0x73, 0xf1, 0x92,
-	0xb6, 0xbe, 0x7a, 0xf7, 0x4a, 0x45, 0x55, 0x1d, 0xb0, 0x57, 0x6b, 0xae, 0x3c, 0x84, 0xbd, 0xee,
-	0xde, 0x18, 0xac, 0xd4, 0x8e, 0x7c, 0xc0, 0x17, 0x50, 0x72, 0x44, 0xdd, 0xc9, 0x2e, 0xe4, 0x12,
-	0x3c, 0x3b, 0x4b, 0x9d, 0x3e, 0x89, 0xa7, 0xa3, 0xd9, 0x58, 0x99, 0xa2, 0xb5, 0xba, 0x4f, 0x19,
-	0x13, 0xe9, 0xd6, 0x5c, 0xd7, 0x07, 0xc6, 0xf0, 0xc7, 0x28, 0xe1, 0xf0, 0xb3, 0xa8, 0x27, 0x33,
-	0x0b, 0x78, 0x72, 0x9b, 0x2b, 0xc2, 0x77, 0x23, 0xfe, 0xf4, 0xb0, 0x18, 0xb1, 0xa4, 0x23, 0xce,
-	0xa1, 0x94, 0x2d, 0xc9, 0x72, 0x51, 0x11, 0x35, 0x3c, 0x96, 0xbf, 0x8e, 0x22, 0x3c, 0x8b, 0xd8,
-	0xf5, 0x6d, 0xc2, 0x06, 0xe0, 0xe3, 0x2e, 0x5a, 0xf2, 0xc1, 0xf1, 0xc6, 0x1e, 0x90, 0x40, 0x85,
-	0xbd, 0x7d, 0x5a, 0xd8, 0xc5, 0xbc, 0x55, 0x0a, 0x33, 0x22, 0x7c, 0x1f, 0x25, 0x44, 0x8f, 0x45,
-	0x12, 0x99, 0xbb, 0x6f, 0x55, 0xe4, 0xe8, 0x2b, 0x7c, 0xf4, 0x33, 0x1e, 0x3a, 0xcb, 0x5e, 0xa0,
-	0xf1, 0x15, 0x14, 0xf5, 0x5c, 0x31, 0x96, 0xf8, 0xc6, 0xf9, 0xa3, 0xc3, 0x62, 0xd4, 0x68, 0xbc,
-	0x38, 0x2c, 0xa2, 0x30, 0x59, 0xa3, 0x61, 0x45, 0x3d, 0x17, 0x6f, 0xa0, 0x04, 0x0b, 0xec, 0x20,
-	0x1c, 0xcb, 0xbb, 0xa7, 0xa4, 0x1b, 0x7a, 0x77, 0xb8, 0x8f, 0x25, 0x5d, 0xcb, 0x63, 0x94, 0x09,
-	0xef, 0x9b, 0x00, 0xd8, 0x46, 0x09, 0x2e, 0x44, 0x96, 0xd3, 0x4a, 0xb1, 0xd7, 0xe7, 0x7b, 0x9b,
-	0xe7, 0xfb, 0xd3, 0x9f, 0xc5, 0xf5, 0xa1, 0x17, 0x6c, 0x4f, 0xb6, 0x2a, 0x0e, 0x1d, 0x55, 0x95,
-	0xae, 0xe5, 0xcf, 0x2d, 0xe6, 0xee, 0x28, 0xb5, 0x72, 0x07, 0x66, 0x49, 0xe6, 0xf2, 0x77, 0x51,
-	0x94, 0x6a, 0x02, 0x18, 0x64, 0x40, 0xf1, 0x3b, 0xf3, 0x73, 0x7e, 0x45, 0xb7, 0x6a, 0x94, 0xe7,
-	0xe7, 0x7b, 0xb8, 0x14, 0xb6, 0xc8, 0x40, 0xe9, 0x01, 0x40, 0xdf, 0xe7, 0xf5, 0xf3, 0x46, 0x2d,
-	0x6f, 0x54, 0x78, 0x46, 0x7f, 0x1c, 0x16, 0xaf, 0xfd, 0x8b, 0x8c, 0x1a, 0xe0, 0x58, 0xa9, 0x01,
-	0x80, 0x65, 0x07, 0x80, 0x37, 0x51, 0x6a, 0xe4, 0x91, 0xfe, 0x00, 0x64, 0x27, 0xff, 0x1b, 0x93,
-	0x41, 0x02, 0x2b, 0x39, 0xf2, 0x08, 0xef, 0x1e, 0x27, 0xb2, 0xa7, 0x82, 0x28, 0x71, 0x46, 0x22,
-	0x7b, 0xda, 0x04, 0x28, 0x3f, 0x44, 0x09, 0xb1, 0x7d, 0xbc, 0x76, 0x17, 0x08, 0x1d, 0xc9, 0x06,
-	0x59, 0xf2, 0x80, 0xaf, 0xa1, 0x73, 0x1e, 0xeb, 0x13, 0x3b, 0xf0, 0x9e, 0x80, 0xdc, 0x61, 0xb5,
-	0xc2, 0x2b, 0x1e, 0x33, 0xc5, 0xad, 0xf0, 0x56, 0x1b, 0xf6, 0x6d, 0x02, 0xad, 0x6e, 0x02, 0x01,
-	0xdf, 0xde, 0x7d, 0x0c, 0x8c, 0xd9, 0x43, 0xbe, 0x92, 0x5c, 0x5f, 0xb2, 0xe9, 0x49, 0xa9, 0x2f,
-	0xa1, 0x28, 0x13, 0x25, 0x19, 0x10, 0x17, 0x7c, 0xa5, 0xd7, 0xb3, 0x6e, 0x80, 0x62, 0x39, 0xbe,
-	0x54, 0xb1, 0xff, 0x6b, 0xa9, 0x2e, 0xa3, 0xe5, 0xb1, 0xbd, 0xb7, 0x4b, 0x6d, 0xb7, 0xbf, 0x6d,
-	0xb3, 0x6d, 0x39, 0x34, 0x2b, 0xa3, 0xee, 0x1e, 0xd8, 0x6c, 0x1b, 0x3f, 0x42, 0x49, 0xae, 0xef,
-	0x09, 0x13, 0x83, 0x58, 0xbd, 0xfb, 0xde, 0x29, 0x51, 0x8f, 0xf7, 0xa7, 0xd2, 0x11, 0xbe, 0x96,
-	0xe2, 0xc0, 0xd5, 0x50, 0x81, 0xc9, 0x53, 0xb6, 0x38, 0x14, 0xe7, 0x6d, 0xb4, 0xcc, 0xe8, 0xc4,
-	0x77, 0xa0, 0x1f, 0x4c, 0xfb, 0x9e, 0x9b, 0x4b, 0x09, 0x35, 0xac, 0x1e, 0x1d, 0x16, 0x51, 0x47,
-	0xdc, 0x77, 0xa7, 0x46, 0xc3, 0x42, 0x2c, 0x7c, 0x76, 0xf9, 0x48, 0xe7, 0x3c, 0x88, 0x0b, 0xd3,
-	0x5c, 0x9a, 0xaf, 0xbf, 0xb5, 0xf2, 0x12, 0xc4, 0x2f, 0xcb, 0xbf, 0x6a, 0x28, 0x29, 0xb3, 0xc3,
-	0xd7, 0x11, 0xee, 0x74, 0x6b, 0xdd, 0x5e, 0xa7, 0xdf, 0x33, 0x3b, 0x6d, 0xbd, 0x6e, 0x34, 0x0d,
-	0xbd, 0x91, 0x8d, 0xe4, 0xcf, 0xed, 0x1f, 0x94, 0x32, 0x26, 0x25, 0xfa, 0xd4, 0x63, 0x81, 0xec,
-	0xd7, 0x39, 0x05, 0xac, 0xb5, 0xdb, 0x56, 0xeb, 0x53, 0xbd, 0x91, 0xd5, 0xf2, 0xcb, 0xfb, 0x07,
-	0xa5, 0x74, 0x6d, 0x3c, 0xf6, 0xe9, 0x13, 0x70, 0xf1, 0x55, 0xb4, 0xa6, 0x20, 0x6d, 0xab, 0x55,
-	0xd7, 0x3b, 0x1d, 0xc3, 0xdc, 0xcc, 0x46, 0xf3, 0xab, 0xfb, 0x07, 0x25, 0xd4, 0xf6, 0xa9, 0x03,
-	0x8c, 0x79, 0x64, 0x38, 0xc7, 0xa4, 0x7f, 0xae, 0xd7, 0x7b, 0x5d, 0xbd, 0x91, 0x8d, 0x49, 0x26,
-	0x7d, 0x0a, 0xce, 0x24, 0x00, 0x17, 0x5f, 0x42, 0x2b, 0x0a, 0xd2, 0xac, 0x19, 0x8f, 0xf4, 0x46,
-	0x36, 0x9e, 0x47, 0xfb, 0x07, 0xa5, 0x64, 0xd3, 0xf6, 0x76, 0xc1, 0xcd, 0xa7, 0xbf, 0xfa, 0xbe,
-	0x10, 0xf9, 0xf1, 0x87, 0x82, 0x56, 0x7e, 0x16, 0x45, 0x99, 0xcf, 0x6c, 0x36, 0x0a, 0x35, 0x39,
-	0xeb, 0xd9, 0x6b, 0x5e, 0x09, 0x19, 0x09, 0x91, 0x1f, 0xbd, 0xab, 0x68, 0x55, 0x79, 0x1c, 0x7f,
-	0xd5, 0xab, 0x96, 0x85, 0x1f, 0x93, 0x0f, 0xd0, 0x9a, 0x0b, 0x2c, 0xf0, 0xf8, 0xbe, 0x50, 0xa2,
-	0xd8, 0x63, 0x27, 0xb1, 0x67, 0xe7, 0x70, 0x32, 0x44, 0x15, 0xbd, 0x31, 0xef, 0x1b, 0xc6, 0x89,
-	0x8b, 0x38, 0x78, 0xce, 0x14, 0x06, 0x5b, 0xd4, 0x66, 0xe2, 0x55, 0x6d, 0x2e, 0x8a, 0x23, 0x79,
-	0x16, 0x71, 0xa4, 0x4e, 0x10, 0xc7, 0xcd, 0xdf, 0x34, 0xb4, 0x72, 0xec, 0x2d, 0x8f, 0x0b, 0x28,
-	0xdf, 0xb5, 0x6a, 0x66, 0xa7, 0xa9, 0x5b, 0x7d, 0x3e, 0x16, 0xfd, 0xb8, 0x56, 0xf0, 0x75, 0x74,
-	0x61, 0xc1, 0xde, 0xd6, 0xcd, 0x06, 0x1f, 0xbe, 0x96, 0xcf, 0xec, 0x1f, 0x94, 0x52, 0x6d, 0x20,
-	0x2e, 0x9f, 0xfc, 0x0d, 0x74, 0x71, 0x01, 0x58, 0xb3, 0xea, 0x0f, 0x0c, 0xae, 0xa5, 0xa8, 0xd2,
-	0x92, 0xef, 0x6c, 0x7b, 0x5c, 0x4b, 0x1f, 0xa2, 0xf2, 0x02, 0xd4, 0x30, 0x3b, 0xbd, 0x66, 0xd3,
-	0xa8, 0x1b, 0xba, 0xd9, 0xed, 0xd7, 0x1e, 0xb7, 0x7a, 0x66, 0x37, 0x1b, 0xcb, 0x5f, 0xd8, 0x3f,
-	0x28, 0x61, 0x83, 0xb0, 0xc9, 0x60, 0xe0, 0x39, 0x7c, 0xb1, 0x6b, 0x23, 0x3a, 0x21, 0xc1, 0x4c,
-	0x22, 0x37, 0x7f, 0xd6, 0xd0, 0x5a, 0x58, 0x4f, 0xc3, 0xf3, 0xc1, 0xe1, 0x9d, 0xc6, 0xf7, 0x50,
-	0xe1, 0x25, 0x7f, 0xc3, 0xb0, 0xf4, 0x7a, 0xd7, 0x68, 0x99, 0x27, 0xed, 0x40, 0x8f, 0xb0, 0x31,
-	0x38, 0xde, 0xc0, 0x03, 0x17, 0xdf, 0x42, 0x6f, 0x9f, 0xe0, 0x64, 0x98, 0xf5, 0xd6, 0x63, 0x59,
-	0xad, 0xa8, 0xc1, 0x20, 0x0e, 0x1d, 0xf1, 0x72, 0x4f, 0x86, 0xb7, 0x7a, 0xdd, 0xcd, 0x96, 0xdc,
-	0x0c, 0x01, 0x6f, 0x4d, 0x82, 0x21, 0xf5, 0xc8, 0x30, 0x1f, 0xe7, 0x29, 0x6f, 0x74, 0x9e, 0xfe,
-	0x5d, 0x88, 0x3c, 0x3d, 0x2a, 0x68, 0xcf, 0x8e, 0x0a, 0xda, 0x5f, 0x47, 0x05, 0xed, 0x9b, 0xe7,
-	0x85, 0xc8, 0xb3, 0xe7, 0x85, 0xc8, 0xef, 0xcf, 0x0b, 0x91, 0x2f, 0xee, 0xcf, 0x7d, 0x03, 0xe4,
-	0xcb, 0x88, 0x40, 0xf0, 0x25, 0xf5, 0x77, 0xd4, 0xe9, 0x96, 0x43, 0x7d, 0xa8, 0x4e, 0x17, 0xfe,
-	0x75, 0x6e, 0x25, 0xc5, 0x5f, 0xbd, 0x7b, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xc7, 0xc5, 0xf7,
-	0x02, 0x95, 0x0a, 0x00, 0x00,
+	0x11, 0xbb, 0x0f, 0xca, 0x82, 0x05, 0xe0, 0xd8, 0xe3, 0x74, 0x68, 0x6b, 0x5b, 0x63, 0x1b, 0x10,
+	0x1b, 0x6b, 0x32, 0x73, 0xec, 0x8c, 0x12, 0xdf, 0x6b, 0xcd, 0x1d, 0x17, 0xe7, 0x1f, 0xa0, 0xb0,
+	0x61, 0xc1, 0x0e, 0x65, 0x81, 0x60, 0x81, 0x10, 0x7f, 0x82, 0x15, 0xdd, 0x20, 0x75, 0x89, 0x58,
+	0x18, 0x48, 0xff, 0x45, 0x57, 0xe8, 0x3e, 0x26, 0x76, 0xdc, 0xa8, 0x29, 0x15, 0x2b, 0xcf, 0xdc,
+	0xf3, 0x9d, 0xef, 0xbc, 0xbe, 0x73, 0xc7, 0xe8, 0x86, 0x35, 0x81, 0x3d, 0xcb, 0x2b, 0x13, 0x98,
+	0x8c, 0x59, 0x19, 0x26, 0x23, 0xea, 0xf9, 0xe0, 0x94, 0x1f, 0xdf, 0xde, 0x06, 0xdf, 0xba, 0x5d,
+	0xf6, 0xf7, 0x47, 0xc0, 0x4a, 0x23, 0x8f, 0xfa, 0x14, 0x5f, 0x92, 0xd0, 0x92, 0x80, 0x96, 0x02,
+	0x68, 0x49, 0x41, 0xb3, 0xe7, 0x07, 0x74, 0x40, 0x05, 0xb2, 0xcc, 0x9f, 0xa4, 0x53, 0x36, 0x67,
+	0x53, 0x36, 0xa4, 0xac, 0xbc, 0x6d, 0x31, 0x38, 0x66, 0xb5, 0xa9, 0x4b, 0x94, 0xfd, 0xba, 0x8a,
+	0xef, 0xb3, 0x97, 0x47, 0x2f, 0xfe, 0xaa, 0xa1, 0x58, 0x75, 0xc7, 0x72, 0x09, 0xbe, 0x8c, 0xa2,
+	0xc4, 0x1a, 0x42, 0x46, 0x2b, 0x68, 0xeb, 0x4b, 0x9b, 0x2b, 0xcf, 0xa7, 0xf9, 0x25, 0x61, 0x68,
+	0x58, 0x43, 0x30, 0x85, 0x09, 0xbf, 0x8f, 0x2e, 0xb2, 0xf1, 0x88, 0xb3, 0xb1, 0x5e, 0x9f, 0x7a,
+	0xe0, 0x0e, 0x48, 0xcf, 0x62, 0x0c, 0x7c, 0x96, 0x89, 0x14, 0xb4, 0xf5, 0xa4, 0xf9, 0x66, 0x60,
+	0xae, 0x4b, 0x6b, 0x45, 0x18, 0xf1, 0x47, 0x28, 0xb9, 0x0b, 0xfb, 0x3d, 0x1e, 0x37, 0x13, 0x2d,
+	0x68, 0xeb, 0xab, 0x77, 0xae, 0x94, 0x54, 0xd5, 0x3e, 0x7b, 0xb1, 0xe6, 0xd2, 0x03, 0xd8, 0xef,
+	0xec, 0x8f, 0xc0, 0x4c, 0xec, 0xca, 0x07, 0x7c, 0x01, 0xc5, 0x87, 0xd4, 0x19, 0xef, 0x41, 0x26,
+	0xc6, 0xb3, 0x33, 0xd5, 0xdb, 0x27, 0xd1, 0x64, 0x38, 0x1d, 0x29, 0x52, 0xb4, 0x56, 0xf5, 0x28,
+	0x63, 0x22, 0xdd, 0x8a, 0xe3, 0x78, 0xc0, 0x18, 0xfe, 0x18, 0xc5, 0x6c, 0xfe, 0x2e, 0xea, 0x49,
+	0xcd, 0x02, 0x9e, 0xde, 0xe6, 0x92, 0xf0, 0xdd, 0x8c, 0x3e, 0x99, 0xe6, 0x43, 0xa6, 0x74, 0xc4,
+	0x19, 0x94, 0xb0, 0x24, 0x59, 0x26, 0x2c, 0xa2, 0x06, 0xaf, 0xc5, 0xaf, 0xc3, 0x08, 0xcf, 0x22,
+	0x76, 0x3c, 0x8b, 0xb0, 0x3e, 0x78, 0xb8, 0x83, 0x96, 0x3c, 0xb0, 0xdd, 0x91, 0x0b, 0xc4, 0x57,
+	0x61, 0x6f, 0x9d, 0x15, 0x76, 0x31, 0x6f, 0x95, 0xc2, 0x8c, 0x08, 0xdf, 0x43, 0x31, 0xd1, 0x63,
+	0x91, 0x44, 0xea, 0xce, 0x5b, 0x25, 0x39, 0xfa, 0x12, 0x1f, 0xfd, 0x8c, 0x87, 0xce, 0xb2, 0x17,
+	0x68, 0x7c, 0x05, 0x85, 0x5d, 0x47, 0x8c, 0x25, 0xba, 0x79, 0xfe, 0x68, 0x9a, 0x0f, 0x1b, 0xb5,
+	0xe7, 0xd3, 0x3c, 0x0a, 0x92, 0x35, 0x6a, 0x66, 0xd8, 0x75, 0xf0, 0x26, 0x8a, 0x31, 0xdf, 0xf2,
+	0x83, 0xb1, 0xbc, 0x7b, 0x46, 0xba, 0x81, 0x77, 0x9b, 0xfb, 0x98, 0xd2, 0xb5, 0x38, 0x42, 0xa9,
+	0xe0, 0xbc, 0x0e, 0x80, 0x2d, 0x14, 0xe3, 0x42, 0x64, 0x19, 0xad, 0x10, 0x79, 0x79, 0xbe, 0xb7,
+	0x78, 0xbe, 0x3f, 0xff, 0x95, 0x5f, 0x1f, 0xb8, 0xfe, 0xce, 0x78, 0xbb, 0x64, 0xd3, 0x61, 0x59,
+	0xe9, 0x5a, 0xfe, 0x6c, 0x30, 0x67, 0x57, 0xa9, 0x95, 0x3b, 0x30, 0x53, 0x32, 0x17, 0xbf, 0x0f,
+	0xa3, 0x44, 0x1d, 0xc0, 0x20, 0x7d, 0x8a, 0xdf, 0x99, 0x9f, 0xf3, 0x0b, 0xba, 0x55, 0xa3, 0x3c,
+	0x3f, 0xdf, 0xc3, 0xa5, 0xa0, 0x45, 0x06, 0x4a, 0xf6, 0x01, 0x7a, 0x1e, 0xaf, 0x9f, 0x37, 0x6a,
+	0x79, 0xb3, 0xc4, 0x33, 0xfa, 0x73, 0x9a, 0xbf, 0xf6, 0x0a, 0x19, 0xd5, 0xc0, 0x36, 0x13, 0x7d,
+	0x00, 0xd3, 0xf2, 0x01, 0x6f, 0xa1, 0xc4, 0xd0, 0x25, 0xbd, 0x3e, 0xc8, 0x4e, 0xfe, 0x37, 0x26,
+	0x83, 0xf8, 0x66, 0x7c, 0xe8, 0x12, 0xde, 0x3d, 0x4e, 0x64, 0x4d, 0x04, 0x51, 0xec, 0x35, 0x89,
+	0xac, 0x49, 0x1d, 0xa0, 0xf8, 0x00, 0xc5, 0xc4, 0xf6, 0xf1, 0xda, 0x1d, 0x20, 0x74, 0x28, 0x1b,
+	0x64, 0xca, 0x17, 0x7c, 0x0d, 0x9d, 0x73, 0x59, 0x8f, 0x58, 0xbe, 0xfb, 0x18, 0xe4, 0x0e, 0xab,
+	0x15, 0x5e, 0x71, 0x59, 0x43, 0x9c, 0x0a, 0x6f, 0xb5, 0x61, 0xdf, 0xc6, 0xd0, 0xea, 0x16, 0x10,
+	0xf0, 0xac, 0xbd, 0x47, 0xc0, 0x98, 0x35, 0xe0, 0x2b, 0xc9, 0xf5, 0x25, 0x9b, 0x1e, 0x97, 0xfa,
+	0x12, 0x8a, 0x6a, 0xa0, 0x38, 0x03, 0xe2, 0x80, 0xa7, 0xf4, 0xfa, 0xba, 0x1b, 0xa0, 0x58, 0x4e,
+	0x2e, 0x55, 0xe4, 0xff, 0x5a, 0xaa, 0xcb, 0x68, 0x79, 0x64, 0xed, 0xef, 0x51, 0xcb, 0xe9, 0xed,
+	0x58, 0x6c, 0x47, 0x0e, 0xcd, 0x4c, 0xa9, 0xb3, 0xfb, 0x16, 0xdb, 0xc1, 0x0f, 0x51, 0x9c, 0xeb,
+	0x7b, 0xcc, 0xc4, 0x20, 0x56, 0xef, 0xbc, 0x77, 0x46, 0xd4, 0x93, 0xfd, 0x29, 0xb5, 0x85, 0xaf,
+	0xa9, 0x38, 0x70, 0x39, 0x50, 0x60, 0xfc, 0x8c, 0x2d, 0x0e, 0xc4, 0x79, 0x0b, 0x2d, 0x33, 0x3a,
+	0xf6, 0x6c, 0xe8, 0xf9, 0x93, 0x9e, 0xeb, 0x64, 0x12, 0x42, 0x0d, 0xab, 0x47, 0xd3, 0x3c, 0x6a,
+	0x8b, 0xf3, 0xce, 0xc4, 0xa8, 0x99, 0x88, 0x05, 0xcf, 0x0e, 0x1f, 0xe9, 0x9c, 0x07, 0x71, 0x60,
+	0x92, 0x49, 0xf2, 0xf5, 0x37, 0x57, 0x8e, 0x41, 0xfc, 0xb0, 0xf8, 0x9b, 0x86, 0xe2, 0x32, 0x3b,
+	0x7c, 0x1d, 0xe1, 0x76, 0xa7, 0xd2, 0xe9, 0xb6, 0x7b, 0xdd, 0x46, 0xbb, 0xa5, 0x57, 0x8d, 0xba,
+	0xa1, 0xd7, 0xd2, 0xa1, 0xec, 0xb9, 0x83, 0xc3, 0x42, 0xaa, 0x41, 0x89, 0x3e, 0x71, 0x99, 0x2f,
+	0xfb, 0x75, 0x4e, 0x01, 0x2b, 0xad, 0x96, 0xd9, 0xfc, 0x54, 0xaf, 0xa5, 0xb5, 0xec, 0xf2, 0xc1,
+	0x61, 0x21, 0x59, 0x19, 0x8d, 0x3c, 0xfa, 0x18, 0x1c, 0x7c, 0x15, 0xad, 0x29, 0x48, 0xcb, 0x6c,
+	0x56, 0xf5, 0x76, 0xdb, 0x68, 0x6c, 0xa5, 0xc3, 0xd9, 0xd5, 0x83, 0xc3, 0x02, 0x6a, 0x79, 0xd4,
+	0x06, 0xc6, 0x5c, 0x32, 0x98, 0x63, 0xd2, 0x3f, 0xd7, 0xab, 0xdd, 0x8e, 0x5e, 0x4b, 0x47, 0x24,
+	0x93, 0x3e, 0x01, 0x7b, 0xec, 0x83, 0x83, 0x2f, 0xa1, 0x15, 0x05, 0xa9, 0x57, 0x8c, 0x87, 0x7a,
+	0x2d, 0x1d, 0xcd, 0xa2, 0x83, 0xc3, 0x42, 0xbc, 0x6e, 0xb9, 0x7b, 0xe0, 0x64, 0x93, 0x5f, 0xfd,
+	0x90, 0x0b, 0xfd, 0xf4, 0x63, 0x4e, 0x2b, 0x7e, 0x17, 0x41, 0xa9, 0xcf, 0x2c, 0x36, 0x0c, 0x34,
+	0x39, 0xeb, 0xd9, 0x4b, 0xae, 0x84, 0x94, 0x84, 0xc8, 0x8f, 0xde, 0x55, 0xb4, 0xaa, 0x3c, 0x4e,
+	0x5e, 0xf5, 0xaa, 0x65, 0xc1, 0xc7, 0xe4, 0x03, 0xb4, 0xe6, 0x00, 0xf3, 0x5d, 0xbe, 0x2f, 0x94,
+	0x28, 0xf6, 0xc8, 0x69, 0xec, 0xe9, 0x39, 0x9c, 0x0c, 0x51, 0x46, 0x6f, 0xcc, 0xfb, 0x06, 0x71,
+	0xa2, 0x22, 0x0e, 0x9e, 0x33, 0x05, 0xc1, 0x16, 0xb5, 0x19, 0x7b, 0x51, 0x9b, 0x8b, 0xe2, 0x88,
+	0xbf, 0x8e, 0x38, 0x12, 0xa7, 0x88, 0x03, 0x1b, 0xc7, 0xeb, 0x9b, 0x14, 0x9c, 0xb7, 0x9f, 0x4f,
+	0xf3, 0x1b, 0xaf, 0x70, 0xf5, 0x54, 0x6c, 0x5b, 0xe5, 0x1f, 0x6c, 0xee, 0xcd, 0xdf, 0x35, 0xb4,
+	0x72, 0xe2, 0x83, 0x81, 0x73, 0x28, 0xdb, 0x31, 0x2b, 0x8d, 0x76, 0x5d, 0x37, 0x7b, 0x7c, 0xc2,
+	0xfa, 0x49, 0xd9, 0xe1, 0xeb, 0xe8, 0xc2, 0x82, 0xbd, 0xa5, 0x37, 0x6a, 0x5c, 0x47, 0x5a, 0x36,
+	0x75, 0x70, 0x58, 0x48, 0xb4, 0x80, 0x38, 0x5c, 0x44, 0x37, 0xd0, 0xc5, 0x05, 0x60, 0xc5, 0xac,
+	0xde, 0x37, 0xb8, 0x2c, 0xc3, 0x4a, 0x96, 0x9e, 0xbd, 0xe3, 0x72, 0x59, 0x7e, 0x88, 0x8a, 0x0b,
+	0x50, 0xa3, 0xd1, 0xee, 0xd6, 0xeb, 0x46, 0xd5, 0xd0, 0x1b, 0x9d, 0x5e, 0xe5, 0x51, 0xb3, 0xdb,
+	0xe8, 0xa4, 0x23, 0xd9, 0x0b, 0x07, 0x87, 0x05, 0x6c, 0x10, 0x36, 0xee, 0xf7, 0x5d, 0x9b, 0xdf,
+	0x11, 0x95, 0x21, 0x1d, 0x13, 0x7f, 0xa6, 0xb6, 0x9b, 0xbf, 0x68, 0x68, 0x2d, 0xa8, 0xa7, 0xe6,
+	0x7a, 0x60, 0xf3, 0xa1, 0xe1, 0xbb, 0x28, 0x77, 0xcc, 0x5f, 0x33, 0x4c, 0xbd, 0xda, 0x31, 0x9a,
+	0x8d, 0xd3, 0xd6, 0xa9, 0x4b, 0xd8, 0x08, 0x6c, 0xb7, 0xef, 0x82, 0x83, 0x37, 0xd0, 0xdb, 0xa7,
+	0x38, 0x19, 0x8d, 0x6a, 0xf3, 0x91, 0xac, 0x56, 0xd4, 0x60, 0x10, 0x9b, 0x0e, 0x79, 0xb9, 0xa7,
+	0xc3, 0x9b, 0xdd, 0xce, 0x56, 0x53, 0x2e, 0x99, 0x80, 0x37, 0xc7, 0xfe, 0x80, 0xba, 0x64, 0x90,
+	0x8d, 0xf2, 0x94, 0x37, 0xdb, 0x4f, 0xfe, 0xc9, 0x85, 0x9e, 0x1c, 0xe5, 0xb4, 0xa7, 0x47, 0x39,
+	0xed, 0xef, 0xa3, 0x9c, 0xf6, 0xcd, 0xb3, 0x5c, 0xe8, 0xe9, 0xb3, 0x5c, 0xe8, 0x8f, 0x67, 0xb9,
+	0xd0, 0x17, 0xf7, 0xe6, 0x66, 0x2a, 0xef, 0x35, 0x02, 0xfe, 0x97, 0xd4, 0xdb, 0x55, 0x6f, 0x1b,
+	0x36, 0xf5, 0xa0, 0x3c, 0x59, 0xf8, 0x03, 0xbb, 0x1d, 0x17, 0xff, 0x1a, 0xef, 0xfe, 0x1b, 0x00,
+	0x00, 0xff, 0xff, 0xdd, 0xe9, 0x7c, 0x51, 0xe0, 0x0a, 0x00, 0x00,
 }
 
 func (m *Chain) Marshal() (dAtA []byte, err error) {
@@ -940,6 +942,13 @@ func (m *WasmMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	if len(m.Sender) > 0 {
+		i -= len(m.Sender)
+		copy(dAtA[i:], m.Sender)
+		i = encodeVarintTypes(dAtA, i, uint64(len(m.Sender)))
+		i--
+		dAtA[i] = 0x42
+	}
 	if m.SourceTxIndex != 0 {
 		i = encodeVarintTypes(dAtA, i, uint64(m.SourceTxIndex))
 		i--
@@ -1180,6 +1189,10 @@ func (m *WasmMessage) Size() (n int) {
 	if m.SourceTxIndex != 0 {
 		n += 1 + sovTypes(uint64(m.SourceTxIndex))
 	}
+	l = len(m.Sender)
+	if l > 0 {
+		n += 1 + l + sovTypes(uint64(l))
+	}
 	return n
 }
 
@@ -2544,6 +2557,40 @@ func (m *WasmMessage) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
+		case 8:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType)
+			}
+			var byteLen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				byteLen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if byteLen < 0 {
+				return ErrInvalidLengthTypes
+			}
+			postIndex := iNdEx + byteLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTypes
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Sender = append(m.Sender[:0], dAtA[iNdEx:postIndex]...)
+			if m.Sender == nil {
+				m.Sender = []byte{}
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipTypes(dAtA[iNdEx:])
diff --git a/x/nexus/keeper/msg_dispatcher.go b/x/nexus/keeper/msg_dispatcher.go
index bd07fb369..25731cefe 100644
--- a/x/nexus/keeper/msg_dispatcher.go
+++ b/x/nexus/keeper/msg_dispatcher.go
@@ -30,9 +30,9 @@ func NewMessenger(nexus types.Nexus) Messenger {
 
 // DispatchMsg decodes the messages from the cosmowasm gateway and routes them to the nexus module if possible
 func (m Messenger) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAddress, _ string, msg wasmvmtypes.CosmosMsg) (events []sdk.Event, data [][]byte, err error) {
-	req := exported.WasmMessage{}
-	if err := json.Unmarshal(msg.Custom, &req); err != nil {
-		return nil, nil, sdkerrors.Wrap(wasmtypes.ErrUnknownMsg, err.Error())
+	req, err := encodeRoutingMessage(contractAddr, msg.Custom)
+	if err != nil {
+		return nil, nil, err
 	}
 
 	gateway := m.GetParams(ctx).Gateway
@@ -77,3 +77,23 @@ func (m Messenger) routeMsg(ctx sdk.Context, msg exported.WasmMessage) error {
 
 	return nil
 }
+
+// EncodeRoutingMessage encodes the message from the wasm contract into a sdk.Msg
+func EncodeRoutingMessage(sender sdk.AccAddress, msg json.RawMessage) ([]sdk.Msg, error) {
+	req, err := encodeRoutingMessage(sender, msg)
+	if err != nil {
+		return nil, err
+	}
+
+	return []sdk.Msg{&req}, nil
+}
+
+func encodeRoutingMessage(sender sdk.AccAddress, msg json.RawMessage) (exported.WasmMessage, error) {
+	req := exported.WasmMessage{}
+	if err := json.Unmarshal(msg, &req); err != nil {
+		return exported.WasmMessage{}, sdkerrors.Wrap(wasmtypes.ErrUnknownMsg, err.Error())
+	}
+
+	req.Sender = sender
+	return req, nil
+}