diff --git a/x/wasm/alias.go b/x/wasm/alias.go
index 3ffd16d..d379fde 100644
--- a/x/wasm/alias.go
+++ b/x/wasm/alias.go
@@ -1,4 +1,8 @@
 // nolint
+// autogenerated code using github.com/rigelrozanski/multitool
+// aliases generated for the following subdirectories:
+// ALIASGEN: github.com/cosmwasm/wasmd/x/wasm/internal/types
+// ALIASGEN: github.com/cosmwasm/wasmd/x/wasm/internal/keeper
 package wasm
 
 import (
@@ -6,46 +10,29 @@ import (
 	"github.com/cosmwasm/wasmd/x/wasm/internal/types"
 )
 
-// autogenerated code using github.com/rigelrozanski/multitool
-// aliases generated for the following subdirectories:
-// ALIASGEN: github.com/cosmwasm/wasmd/x/wasm/internal/keeper/
-// ALIASGEN: github.com/cosmwasm/wasmd/x/wasm/internal/types/
-
 const (
-	GasMultiplier         = keeper.GasMultiplier
-	MaxGas                = keeper.MaxGas
-	QueryListContracts    = keeper.QueryListContracts
-	QueryGetContract      = keeper.QueryGetContract
-	QueryGetContractState = keeper.QueryGetContractState
-	QueryGetCode          = keeper.QueryGetCode
-	QueryListCode         = keeper.QueryListCode
-	DefaultCodespace      = types.DefaultCodespace
-	CodeCreatedFailed     = types.CodeCreatedFailed
-	CodeAccountExists     = types.CodeAccountExists
-	CodeInstantiateFailed = types.CodeInstantiateFailed
-	CodeExecuteFailed     = types.CodeExecuteFailed
-	CodeGasLimit          = types.CodeGasLimit
-	ModuleName            = types.ModuleName
-	StoreKey              = types.StoreKey
-	TStoreKey             = types.TStoreKey
-	QuerierRoute          = types.QuerierRoute
-	RouterKey             = types.RouterKey
-	MaxWasmSize           = types.MaxWasmSize
+	ModuleName                    = types.ModuleName
+	StoreKey                      = types.StoreKey
+	TStoreKey                     = types.TStoreKey
+	QuerierRoute                  = types.QuerierRoute
+	RouterKey                     = types.RouterKey
+	MaxWasmSize                   = types.MaxWasmSize
+	GasMultiplier                 = keeper.GasMultiplier
+	MaxGas                        = keeper.MaxGas
+	QueryListContracts            = keeper.QueryListContracts
+	QueryGetContract              = keeper.QueryGetContract
+	QueryGetContractState         = keeper.QueryGetContractState
+	QueryGetCode                  = keeper.QueryGetCode
+	QueryListCode                 = keeper.QueryListCode
+	QueryMethodContractStateSmart = keeper.QueryMethodContractStateSmart
+	QueryMethodContractStateAll   = keeper.QueryMethodContractStateAll
+	QueryMethodContractStateRaw   = keeper.QueryMethodContractStateRaw
 )
 
 var (
 	// functions aliases
-	NewKeeper                 = keeper.NewKeeper
-	NewQuerier                = keeper.NewQuerier
-	MakeTestCodec             = keeper.MakeTestCodec
-	CreateTestInput           = keeper.CreateTestInput
 	RegisterCodec             = types.RegisterCodec
-	ErrCreateFailed           = types.ErrCreateFailed
-	ErrAccountExists          = types.ErrAccountExists
-	ErrInstantiateFailed      = types.ErrInstantiateFailed
-	ErrExecuteFailed          = types.ErrExecuteFailed
-	ErrGasLimit               = types.ErrGasLimit
-	ErrInvalidGenesis         = types.ErrInvalidGenesis
+	ValidateGenesis           = types.ValidateGenesis
 	GetCodeKey                = types.GetCodeKey
 	GetContractAddressKey     = types.GetContractAddressKey
 	GetContractStorePrefixKey = types.GetContractStorePrefixKey
@@ -54,29 +41,42 @@ var (
 	NewWasmCoins              = types.NewWasmCoins
 	NewContractInfo           = types.NewContractInfo
 	CosmosResult              = types.CosmosResult
-
-	// genesis aliases
-	ValidateGenesis = types.ValidateGenesis
-	InitGenesis     = keeper.InitGenesis
-	ExportGenesis   = keeper.ExportGenesis
+	InitGenesis               = keeper.InitGenesis
+	ExportGenesis             = keeper.ExportGenesis
+	NewKeeper                 = keeper.NewKeeper
+	NewQuerier                = keeper.NewQuerier
+	MakeTestCodec             = keeper.MakeTestCodec
+	CreateTestInput           = keeper.CreateTestInput
 
 	// variable aliases
-	ModuleCdc           = types.ModuleCdc
-	KeyLastCodeID       = types.KeyLastCodeID
-	KeyLastInstanceID   = types.KeyLastInstanceID
-	CodeKeyPrefix       = types.CodeKeyPrefix
-	ContractKeyPrefix   = types.ContractKeyPrefix
-	ContractStorePrefix = types.ContractStorePrefix
+	ModuleCdc            = types.ModuleCdc
+	DefaultCodespace     = types.DefaultCodespace
+	ErrCreateFailed      = types.ErrCreateFailed
+	ErrAccountExists     = types.ErrAccountExists
+	ErrInstantiateFailed = types.ErrInstantiateFailed
+	ErrExecuteFailed     = types.ErrExecuteFailed
+	ErrGasLimit          = types.ErrGasLimit
+	ErrInvalidGenesis    = types.ErrInvalidGenesis
+	ErrNotFound          = types.ErrNotFound
+	ErrQueryFailed       = types.ErrQueryFailed
+	KeyLastCodeID        = types.KeyLastCodeID
+	KeyLastInstanceID    = types.KeyLastInstanceID
+	CodeKeyPrefix        = types.CodeKeyPrefix
+	ContractKeyPrefix    = types.ContractKeyPrefix
+	ContractStorePrefix  = types.ContractStorePrefix
 )
 
 type (
-	Keeper                 = keeper.Keeper
-	GetCodeResponse        = keeper.GetCodeResponse
+	GenesisState           = types.GenesisState
+	Code                   = types.Code
+	Contract               = types.Contract
 	MsgStoreCode           = types.MsgStoreCode
 	MsgInstantiateContract = types.MsgInstantiateContract
 	MsgExecuteContract     = types.MsgExecuteContract
+	Model                  = types.Model
 	CodeInfo               = types.CodeInfo
 	ContractInfo           = types.ContractInfo
-
-	GenesisState = types.GenesisState
+	Keeper                 = keeper.Keeper
+	GetCodeResponse        = keeper.GetCodeResponse
+	ListCodeResponse       = keeper.ListCodeResponse
 )