diff --git a/app/app.go b/app/app.go
index eebbe25d..f54781db 100644
--- a/app/app.go
+++ b/app/app.go
@@ -132,13 +132,13 @@ func NewCyberdApp(
 		app.cdc, dbKeys.stake,
 		dbKeys.tStake, app.coinKeeper,
 		app.paramsKeeper.Subspace(stake.DefaultParamspace),
-		app.RegisterCodespace(stake.DefaultCodespace),
+		stake.DefaultCodespace,
 	)
 	app.slashingKeeper = slashing.NewKeeper(
 		app.cdc,
 		dbKeys.slashing,
 		&stakeKeeper, app.paramsKeeper.Subspace(slashing.DefaultParamspace),
-		app.RegisterCodespace(slashing.DefaultCodespace),
+		slashing.DefaultCodespace,
 	)
 	app.memStorage = &InMemoryStorage{}
 
@@ -164,7 +164,7 @@ func NewCyberdApp(
 	app.SetAnteHandler(auth.NewAnteHandler(app.accountKeeper, app.feeCollectionKeeper))
 
 	// mount the multistore and load the latest state
-	app.MountStoresIAVL(dbKeys.main, dbKeys.acc, dbKeys.cidIndex, dbKeys.links, dbKeys.rank, dbKeys.stake,
+	app.MountStores(dbKeys.main, dbKeys.acc, dbKeys.cidIndex, dbKeys.links, dbKeys.rank, dbKeys.stake,
 		dbKeys.slashing, dbKeys.params)
 	app.MountStoresTransient(dbKeys.tParams, dbKeys.tStake)
 	err := app.LoadLatestVersion(dbKeys.main)
@@ -294,9 +294,10 @@ func (app *CyberdApp) EndBlocker(ctx sdk.Context, _ abci.RequestEndBlock) abci.R
 	app.memStorage.UpdateRank(newRank)
 	app.mainStorage.StoreAppHash(ctx, hash[:])
 
-	validatorUpdates := stake.EndBlocker(ctx, app.stakeKeeper)
+	validatorUpdates, tags := stake.EndBlocker(ctx, app.stakeKeeper)
 	return abci.ResponseEndBlock{
 		ValidatorUpdates: validatorUpdates,
+		Tags:             tags,
 	}
 }
 
diff --git a/app/genesis.go b/app/genesis.go
index dbbb5b70..a278d071 100644
--- a/app/genesis.go
+++ b/app/genesis.go
@@ -4,11 +4,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/cosmos/cosmos-sdk/codec"
-	"github.com/cosmos/cosmos-sdk/server"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/slashing"
 	"github.com/cosmos/cosmos-sdk/x/stake"
+	"github.com/cybercongress/cyberd/app/coin"
 	"github.com/pkg/errors"
 	tmtypes "github.com/tendermint/tendermint/types"
 	"io/ioutil"
@@ -18,13 +18,6 @@ import (
 	"strings"
 )
 
-var (
-	// bonded tokens given to genesis validators/accounts
-	freeFermionVal  = int64(100)
-	freeFermionsAcc = sdk.NewInt(150)
-	bondDenom       = "CBD"
-)
-
 // State to Unmarshal
 type GenesisState struct {
 	Accounts     []GenesisAccount      `json:"accounts"`
@@ -48,8 +41,8 @@ type GenesisAccount struct {
 	Name          string         `json:"name"`
 	Address       sdk.AccAddress `json:"address"`
 	Coins         sdk.Coins      `json:"coins"`
-	Sequence      int64          `json:"sequence_number"`
-	AccountNumber int64          `json:"account_number"`
+	Sequence      uint64         `json:"sequence_number"`
+	AccountNumber uint64         `json:"account_number"`
 }
 
 func NewGenesisAccount(acc *auth.BaseAccount) GenesisAccount {
@@ -80,14 +73,6 @@ func (ga *GenesisAccount) ToAccount() (acc *auth.BaseAccount) {
 	}
 }
 
-// get app init parameters for server init command
-func CyberdAppInit() server.AppInit {
-
-	return server.AppInit{
-		AppGenState: CyberdAppGenStateJSON,
-	}
-}
-
 // Create the core parameters for genesis initialization for cyberd
 // note that the pubkey input is this machines pubkey
 func CyberdAppGenState(cdc *codec.Codec, genDoc tmtypes.GenesisDoc, appGenTxs []json.RawMessage) (
@@ -115,16 +100,15 @@ func CyberdAppGenState(cdc *codec.Codec, genDoc tmtypes.GenesisDoc, appGenTxs []
 		}
 		if _, ok := msgs[0].(stake.MsgCreateValidator); !ok {
 			return genesisState, fmt.Errorf(
-				"Genesis transaction %v does not contain a MsgCreateValidator", i)
+				"genesis transaction %v does not contain a MsgCreateValidator", i)
 		}
 	}
 
 	for _, acc := range genesisState.Accounts {
-		// create the genesis account, give'm few steaks and a buncha token with there name
-		for _, coin := range acc.Coins {
-			if coin.Denom == bondDenom {
+		for _, c := range acc.Coins {
+			if c.Denom == coin.CBD {
 				stakeData.Pool.LooseTokens = stakeData.Pool.LooseTokens.
-					Add(sdk.NewDecFromInt(coin.Amount)) // increase the supply
+					Add(sdk.NewDecFromInt(c.Amount)) // increase the supply
 			}
 		}
 	}
diff --git a/app/handler.go b/app/handler.go
index 7eb66b0e..a51c9fd1 100644
--- a/app/handler.go
+++ b/app/handler.go
@@ -25,14 +25,14 @@ func NewLinksHandler(cis CidIndexStorage, ls LinksStorage, imms *InMemoryStorage
 		link := cbd.NewLink(fromCidNumber, toCidNumber, accNumber)
 
 		if ls.IsLinkExist(ctx, link) {
-			return sdk.Result{Code: cbd.LinkAlreadyExistsCode()}
+			return sdk.Result{Code: cbd.CodeLinkAlreadyExist, Codespace: cbd.CodespaceCbd}
 		}
 
 		if !ctx.IsCheckTx() {
 			imms.AddLink(link)
 		}
 
-		return sdk.Result{Code: sdk.ABCICodeOK}
+		return sdk.Result{Code: cbd.CodeOK, Codespace: cbd.CodespaceCbd}
 	}
 }
 
diff --git a/app/rpc.go b/app/rpc.go
index 121c81a9..7a3b47d1 100644
--- a/app/rpc.go
+++ b/app/rpc.go
@@ -23,13 +23,5 @@ func (app *CyberdApp) Account(address sdk.AccAddress) auth.Account {
 	if acc != nil {
 		return acc
 	}
-
-	// no acc in chain, assume new one, so balance 0 and seq 0
-	// acc number -1 is for addresses not in chain
-	return &auth.BaseAccount{
-		Address:       address,
-		Sequence:      0,
-		Coins:         make(sdk.Coins, 0),
-		AccountNumber: -1,
-	}
+	return nil
 }
diff --git a/app/types/errors.go b/app/types/errors.go
index 22490097..41a511a1 100644
--- a/app/types/errors.go
+++ b/app/types/errors.go
@@ -13,7 +13,7 @@ const (
 	CodeCidNotFound      sdk.CodeType = 3
 
 	// Code space
-	CodespaceCBD sdk.CodespaceType = 42
+	CodespaceCbd sdk.CodespaceType = "cyberd"
 )
 
 func codeToDefaultMsg(code sdk.CodeType) string {
@@ -29,22 +29,15 @@ func codeToDefaultMsg(code sdk.CodeType) string {
 	}
 }
 
-//----------------------------------------
-// Code constructors
-
-func LinkAlreadyExistsCode() sdk.ABCICodeType {
-	return sdk.ToABCICode(CodespaceCBD, CodeLinkAlreadyExist)
-}
-
 //----------------------------------------
 // Error constructors
 
 func ErrInvalidCid() sdk.Error {
-	return newError(CodespaceCBD, CodeInvalidCid)
+	return newError(CodespaceCbd, CodeInvalidCid)
 }
 
 func ErrCidNotFound() sdk.Error {
-	return newError(CodespaceCBD, CodeCidNotFound)
+	return newError(CodespaceCbd, CodeCidNotFound)
 }
 
 func newError(codespace sdk.CodespaceType, code sdk.CodeType) sdk.Error {
diff --git a/claim/context/ctx.go b/claim/context/ctx.go
index 3899f5d6..54ee31f5 100644
--- a/claim/context/ctx.go
+++ b/claim/context/ctx.go
@@ -22,8 +22,8 @@ type ClaimContext struct {
 	CliContext    cli.CLIContext
 	ipClaims      map[string]int
 	Mtx           *sync.Mutex
-	Sequence      *int64
-	AccountNumber int64
+	Sequence      *uint64
+	AccountNumber uint64
 }
 
 func NewClaimContext() (ClaimContext, error) {
@@ -35,7 +35,7 @@ func NewClaimContext() (ClaimContext, error) {
 
 	cliCtx := newCLIContext(name, chainId, viper.GetString(common.FlagNode)).
 		WithCodec(cdc).
-		WithAccountDecoder(app.GetAccountDecoder(cdc))
+		WithAccountDecoder(cdc)
 
 	address, err := types.AccAddressFromBech32(viper.GetString(common.FlagAddress))
 	if err != nil {
diff --git a/cyberd/init/gentx.go b/cyberd/init/gentx.go
index 3c5ee816..10ce4ec6 100644
--- a/cyberd/init/gentx.go
+++ b/cyberd/init/gentx.go
@@ -84,7 +84,7 @@ following delegation and commission default parameters:
 			w.Close()
 
 			prepareFlagsForTxSign()
-			signCmd := authcmd.GetSignCommand(cdc, authcmd.GetAccountDecoder(cdc))
+			signCmd := authcmd.GetSignCommand(cdc)
 			if w, err = prepareOutputFile(config.RootDir, nodeID); err != nil {
 				return err
 			}
diff --git a/cyberd/init/init.go b/cyberd/init/init.go
index 4f2118f4..80202fa0 100644
--- a/cyberd/init/init.go
+++ b/cyberd/init/init.go
@@ -42,7 +42,7 @@ func displayInfo(cdc *codec.Codec, info printInfo) error {
 
 // get cmd to initialize all files for tendermint and application
 // nolint
-func InitCmd(ctx *server.Context, cdc *codec.Codec, appInit server.AppInit) *cobra.Command {
+func InitCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "init",
 		Short: "Initialize private validator, p2p, genesis, and application configuration files",
diff --git a/cyberd/init/testnet.go b/cyberd/init/testnet.go
index 1bca0adb..d8308fbf 100644
--- a/cyberd/init/testnet.go
+++ b/cyberd/init/testnet.go
@@ -37,8 +37,7 @@ var (
 const nodeDirPerm = 0755
 
 // get cmd to initialize all files for tendermint testnet and application
-func TestnetFilesCmd(ctx *server.Context, cdc *codec.Codec,
-	appInit server.AppInit) *cobra.Command {
+func TestnetFilesCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:   "testnet",
diff --git a/cyberd/main.go b/cyberd/main.go
index 4454fd87..24c55b91 100644
--- a/cyberd/main.go
+++ b/cyberd/main.go
@@ -30,21 +30,20 @@ func main() {
 	app.SetPrefix()
 	ctx := server.NewDefaultContext()
 
+	cobra.EnableCommandSorting = false
 	rootCmd := &cobra.Command{
 		Use:               "cyberd",
 		Short:             "Cyberd Daemon (server)",
 		PersistentPreRunE: server.PersistentPreRunEFn(ctx),
 	}
 
-	appInit := app.CyberdAppInit()
-
-	rootCmd.AddCommand(initCyberd.InitCmd(ctx, cdc, appInit))
+	rootCmd.AddCommand(initCyberd.InitCmd(ctx, cdc))
 	rootCmd.AddCommand(initCyberd.GenerateAccountCmd())
 	rootCmd.AddCommand(initCyberd.CollectGenTxsCmd(ctx, cdc))
-	rootCmd.AddCommand(initCyberd.TestnetFilesCmd(ctx, cdc, server.AppInit{}))
+	rootCmd.AddCommand(initCyberd.TestnetFilesCmd(ctx, cdc))
 	rootCmd.AddCommand(initCyberd.GenTxCmd(ctx, cdc))
 	rootCmd.AddCommand(initCyberd.AddGenesisAccountCmd(ctx, cdc))
-	server.AddCommands(ctx, cdc, rootCmd, appInit, newApp, exportAppStateAndTMValidators)
+	server.AddCommands(ctx, cdc, rootCmd, newApp, exportAppStateAndTMValidators)
 
 	for _, c := range rootCmd.Commands() {
 		if c.Use == "start" {
@@ -74,7 +73,10 @@ func newApp(logger log.Logger, db dbm.DB, storeTracer io.Writer) abci.Applicatio
 	return cyberdApp
 }
 
-func exportAppStateAndTMValidators(logger log.Logger, db dbm.DB, storeTracer io.Writer) (json.RawMessage, []tmtypes.GenesisValidator, error) {
+func exportAppStateAndTMValidators(
+	logger log.Logger, db dbm.DB, traceStore io.Writer, height int64, forZeroHeight bool,
+) (json.RawMessage, []tmtypes.GenesisValidator, error) {
+
 	capp := app.NewCyberdApp(logger, db, rank.CPU)
 	return capp.ExportAppStateAndValidators()
 }
diff --git a/cyberdcli/commands/linktx.go b/cyberdcli/commands/linktx.go
index f0e55e4e..d4436ca5 100644
--- a/cyberdcli/commands/linktx.go
+++ b/cyberdcli/commands/linktx.go
@@ -5,7 +5,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/utils"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
 	authtxb "github.com/cosmos/cosmos-sdk/x/auth/client/txbuilder"
 	cbd "github.com/cybercongress/cyberd/app/types"
 	. "github.com/cybercongress/cyberd/cyberdcli/util"
@@ -28,7 +27,7 @@ func LinkTxCmd(cdc *codec.Codec) *cobra.Command {
 			txCtx := authtxb.NewTxBuilderFromCLI().WithCodec(cdc)
 			cliCtx := context.NewCLIContext().
 				WithCodec(cdc).
-				WithAccountDecoder(authcmd.GetAccountDecoder(cdc))
+				WithAccountDecoder(cdc)
 
 			if err := cliCtx.EnsureAccountExists(); err != nil {
 				return err
diff --git a/cyberdcli/main.go b/cyberdcli/main.go
index f2e52966..fbf04f10 100644
--- a/cyberdcli/main.go
+++ b/cyberdcli/main.go
@@ -1,30 +1,34 @@
 package main
 
 import (
+	"github.com/cosmos/cosmos-sdk/client/tx"
+	"github.com/tendermint/go-amino"
 	"os"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/keys"
-	"github.com/cosmos/cosmos-sdk/client/lcd"
 	"github.com/cosmos/cosmos-sdk/client/rpc"
-	"github.com/cosmos/cosmos-sdk/client/tx"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/version"
-	authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
-	bankcmd "github.com/cosmos/cosmos-sdk/x/bank/client/cli"
-	slashingcmd "github.com/cosmos/cosmos-sdk/x/slashing/client/cli"
-	stakecmd "github.com/cosmos/cosmos-sdk/x/stake/client/cli"
 	"github.com/cybercongress/cyberd/app"
 	cyberdcmd "github.com/cybercongress/cyberd/cyberdcli/commands"
 	"github.com/spf13/cobra"
 	"github.com/tendermint/tendermint/libs/cli"
+
+	authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
+	bankcmd "github.com/cosmos/cosmos-sdk/x/bank/client/cli"
+	distClient "github.com/cosmos/cosmos-sdk/x/distribution/client"
+	govClient "github.com/cosmos/cosmos-sdk/x/gov/client"
+	slashingClient "github.com/cosmos/cosmos-sdk/x/slashing/client"
+	stakeClient "github.com/cosmos/cosmos-sdk/x/stake/client"
 )
 
-// cyberdcli is the entry point for this binary
-var (
-	cyberdcli = &cobra.Command{
-		Use:   "cyberdcli",
-		Short: "Cyberd node client",
-	}
+const (
+	storeAcc      = "acc"
+	storeGov      = "gov"
+	storeSlashing = "slashing"
+	storeStake    = "stake"
+	storeDist     = "distr"
 )
 
 func main() {
@@ -35,42 +39,34 @@ func main() {
 	cdc := app.MakeCodec()
 	app.SetPrefix()
 
-	// TODO: Setup keybase, viper object, etc. to be passed into
-	// the below functions and eliminate global vars, like we do
-	// with the cdc.
+	cyberdcli := &cobra.Command{
+		Use:   "gaiacli",
+		Short: "Command line interface for interacting with gaiad",
+	}
 
-	rpc.AddCommands(cyberdcli) // Node management commands
-	cyberdcli.AddCommand(client.LineBreak)
-	tx.AddCommands(cyberdcli, cdc) // Txs info commands
-	cyberdcli.AddCommand(client.LineBreak)
-	cyberdcli.AddCommand(rpc.BlockCommand()) // Block info command
-	cyberdcli.AddCommand(client.LineBreak)
+	mc := []sdk.ModuleClients{
+		govClient.NewModuleClient(storeGov, cdc),
+		distClient.NewModuleClient(storeDist, cdc),
+		stakeClient.NewModuleClient(storeStake, cdc),
+		slashingClient.NewModuleClient(storeSlashing, cdc),
+	}
 
+	// Construct Root Command
 	cyberdcli.AddCommand(
-		client.GetCommands(
-			authcmd.GetAccountCmd("acc", cdc, app.GetAccountDecoder(cdc)),
-		)...)
+		rpc.StatusCommand(),
+		client.ConfigCmd(),
+		queryCmd(cdc, mc),
+		txCmd(cdc, mc),
+		keys.Commands(),
+		client.LineBreak,
+		version.VersionCmd,
+	)
 
 	cyberdcli.AddCommand(
 		client.PostCommands(
 			cyberdcmd.LinkTxCmd(cdc),
-			bankcmd.SendTxCmd(cdc),
-			stakecmd.GetCmdCreateValidator(cdc),
-			stakecmd.GetCmdEditValidator(cdc),
-			stakecmd.GetCmdDelegate(cdc),
-			stakecmd.GetCmdRedelegate("stake", cdc),
-			stakecmd.GetCmdUnbond("stake", cdc),
-			slashingcmd.GetCmdUnjail(cdc),
 		)...)
 
-	cyberdcli.AddCommand(
-		client.LineBreak,
-		lcd.ServeCommand(cdc), // Commands to start local rpc proxy to node
-		keys.Commands(),       // Commands to generate and handle keys
-		client.LineBreak,
-		version.VersionCmd,
-	)
-
 	executor := cli.PrepareMainCmd(cyberdcli, "CBD", os.ExpandEnv("$HOME/.cyberdcli"))
 	err := executor.Execute()
 	if err != nil {
@@ -78,3 +74,47 @@ func main() {
 		panic(err)
 	}
 }
+
+func queryCmd(cdc *amino.Codec, mc []sdk.ModuleClients) *cobra.Command {
+	queryCmd := &cobra.Command{
+		Use:     "query",
+		Aliases: []string{"q"},
+		Short:   "Querying subcommands",
+	}
+
+	queryCmd.AddCommand(
+		rpc.ValidatorCommand(),
+		rpc.BlockCommand(),
+		tx.SearchTxCmd(cdc),
+		tx.QueryTxCmd(cdc),
+		client.LineBreak,
+		authcmd.GetAccountCmd(storeAcc, cdc),
+	)
+
+	for _, m := range mc {
+		queryCmd.AddCommand(m.GetQueryCmd())
+	}
+
+	return queryCmd
+}
+
+func txCmd(cdc *amino.Codec, mc []sdk.ModuleClients) *cobra.Command {
+	txCmd := &cobra.Command{
+		Use:   "tx",
+		Short: "Transactions subcommands",
+	}
+
+	txCmd.AddCommand(
+		bankcmd.SendTxCmd(cdc),
+		client.LineBreak,
+		authcmd.GetSignCommand(cdc),
+		bankcmd.GetBroadcastCommand(cdc),
+		client.LineBreak,
+	)
+
+	for _, m := range mc {
+		txCmd.AddCommand(m.GetTxCmd())
+	}
+
+	return txCmd
+}
diff --git a/go.mod b/go.mod
index 15c86842..b7403573 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/bgentry/speakeasy v0.1.0 // indirect
 	github.com/btcsuite/btcd v0.0.0-20180903232927-cff30e1d23fc // indirect
 	github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a // indirect
-	github.com/cosmos/cosmos-sdk v0.26.1-rc1
+	github.com/cosmos/cosmos-sdk v0.27.0
 	github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8
 	github.com/ebuchman/fail-test v0.0.0-20170303061230-95f809107225 // indirect
 	github.com/fortytw2/leaktest v1.2.0 // indirect
@@ -51,12 +51,12 @@ require (
 	github.com/spf13/pflag v1.0.2
 	github.com/spf13/viper v1.0.0
 	github.com/stretchr/testify v1.2.1 // indirect
-	github.com/syndtr/goleveldb v0.0.0-20180815032940-ae2bd5eed72d // indirect
+	github.com/syndtr/goleveldb v0.0.0-20180708030551-c4c61651e9e3 // indirect
 	github.com/tendermint/btcd v0.0.0-20180816174608-e5840949ff4f // indirect
 	github.com/tendermint/ed25519 v0.0.0-20171027050219-d8387025d2b9 // indirect
-	github.com/tendermint/go-amino v0.14.0
-	github.com/tendermint/iavl v0.11.1 // indirect
-	github.com/tendermint/tendermint v0.26.1
+	github.com/tendermint/go-amino v0.14.1
+	github.com/tendermint/iavl v0.12.0 // indirect
+	github.com/tendermint/tendermint v0.27.0-dev1
 	github.com/zondax/ledger-goclient v0.1.0 // indirect
 	golang.org/x/crypto v0.0.0-20181015023909-0c41d7ab0a0e // indirect
 	golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3 // indirect
diff --git a/go.sum b/go.sum
index df4f9164..eacc1c83 100644
--- a/go.sum
+++ b/go.sum
@@ -19,6 +19,8 @@ github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a/go.mod h1:+5NJ2+q
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cosmos/cosmos-sdk v0.26.1-rc1 h1:OLFzEbZ9SJC9NaCaqyvSWev3YdhoI5NayX4lLxsqtGs=
 github.com/cosmos/cosmos-sdk v0.26.1-rc1/go.mod h1:JrX/JpJunJQXBI5PEX2zELHMFzQr/159jDjIhesOh2c=
+github.com/cosmos/cosmos-sdk v0.27.0 h1:EKMsS3SoEL+MN1WH1VwiUUbUjmmmHyseQA49QzgJ/Lw=
+github.com/cosmos/cosmos-sdk v0.27.0/go.mod h1:JrX/JpJunJQXBI5PEX2zELHMFzQr/159jDjIhesOh2c=
 github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8 h1:Iwin12wRQtyZhH6FV3ykFcdGNlYEzoeR0jN8Vn+JWsI=
 github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -103,6 +105,8 @@ github.com/spf13/viper v1.0.0 h1:RUA/ghS2i64rlnn4ydTfblY8Og8QzcPtCcHvgMn+w/I=
 github.com/spf13/viper v1.0.0/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM=
 github.com/stretchr/testify v1.2.1 h1:52QO5WkIUcHGIR7EnGagH88x1bUzqGXTC5/1bDTUQ7U=
 github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/syndtr/goleveldb v0.0.0-20180708030551-c4c61651e9e3 h1:sAlSBRDl4psFR3ysKXRSE8ss6Mt90+ma1zRTroTNBJA=
+github.com/syndtr/goleveldb v0.0.0-20180708030551-c4c61651e9e3/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/syndtr/goleveldb v0.0.0-20180815032940-ae2bd5eed72d h1:4J9HCZVpvDmj2tiKGSTUnb3Ok/9CEQb9oqu9LHKQQpc=
 github.com/syndtr/goleveldb v0.0.0-20180815032940-ae2bd5eed72d/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/tendermint/btcd v0.0.0-20180816174608-e5840949ff4f h1:R0wLxgASGMoRQTF/dCSk4N+M3j9DLyPDzDff2WtCg/I=
@@ -115,14 +119,20 @@ github.com/tendermint/go-amino v0.12.0 h1:zpGVp3gOCwlju/4plyGEI0vLFY389o9i1Pasld
 github.com/tendermint/go-amino v0.12.0/go.mod h1:i/UKE5Uocn+argJJBb12qTZsCDBcAYMbR92AaJVmKso=
 github.com/tendermint/go-amino v0.14.0 h1:KQpB5tjLqe4+m/TQT93lfg1VdYypbEwrqtDMk84o4Bs=
 github.com/tendermint/go-amino v0.14.0/go.mod h1:i/UKE5Uocn+argJJBb12qTZsCDBcAYMbR92AaJVmKso=
+github.com/tendermint/go-amino v0.14.1 h1:o2WudxNfdLNBwMyl2dqOJxiro5rfrEaU0Ugs6offJMk=
+github.com/tendermint/go-amino v0.14.1/go.mod h1:i/UKE5Uocn+argJJBb12qTZsCDBcAYMbR92AaJVmKso=
 github.com/tendermint/iavl v0.11.0 h1:3RsyfghB/8hD5Fa9zN1dvPu35vnC0SbnjmEiSyWRbAw=
 github.com/tendermint/iavl v0.11.0/go.mod h1:EoKMMv++tDOL5qKKVnoIqtVPshRrEPeJ0WsgDOLAauM=
 github.com/tendermint/iavl v0.11.1 h1:qcEBQRj189WuAdSeTm3jx9waySYltnX1IdATyQA1gRU=
 github.com/tendermint/iavl v0.11.1/go.mod h1:EoKMMv++tDOL5qKKVnoIqtVPshRrEPeJ0WsgDOLAauM=
+github.com/tendermint/iavl v0.12.0 h1:xcaFAr+ycqCj7WN1RzL2EfcBioRDOHcU1oWcg83K028=
+github.com/tendermint/iavl v0.12.0/go.mod h1:EoKMMv++tDOL5qKKVnoIqtVPshRrEPeJ0WsgDOLAauM=
 github.com/tendermint/tendermint v0.25.1-rc0 h1:ZFI9ha8A88vTYoLwVjrTYljR0GvKsUDKGXDsdPFnZ0s=
 github.com/tendermint/tendermint v0.25.1-rc0/go.mod h1:ymcPyWblXCplCPQjbOYbrF1fWnpslATMVqiGgWbZrlc=
 github.com/tendermint/tendermint v0.26.1 h1:lrHaNz3K/+vB3V9DfHWEvh7LNiZdaJsmmqO6SVDVd28=
 github.com/tendermint/tendermint v0.26.1/go.mod h1:ymcPyWblXCplCPQjbOYbrF1fWnpslATMVqiGgWbZrlc=
+github.com/tendermint/tendermint v0.27.0-dev1 h1:KwVYIeQjU4m8aZr6ID9xqZ+i3RiHRSZ0d5GHxP9LE8A=
+github.com/tendermint/tendermint v0.27.0-dev1/go.mod h1:ymcPyWblXCplCPQjbOYbrF1fWnpslATMVqiGgWbZrlc=
 github.com/zondax/ledger-goclient v0.1.0/go.mod h1:ILyu7qO5zsod0bzyxY9NCMlFTb8AXZzJAJf0T85b2jA=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
diff --git a/proxy/core/types.go b/proxy/core/types.go
index 2a39b650..7bac9215 100644
--- a/proxy/core/types.go
+++ b/proxy/core/types.go
@@ -5,6 +5,6 @@ import "github.com/tendermint/tendermint/crypto/secp256k1"
 type Signature struct {
 	PubKey        secp256k1.PubKeySecp256k1 `json:"pub_key"` // optional
 	Signature     []byte                    `json:"signature"`
-	AccountNumber int64                     `json:"account_number"`
-	Sequence      int64                     `json:"sequence"`
+	AccountNumber uint64                    `json:"account_number"`
+	Sequence      uint64                    `json:"sequence"`
 }
diff --git a/wiki/client.go b/wiki/client.go
index 4deae330..531eae82 100644
--- a/wiki/client.go
+++ b/wiki/client.go
@@ -7,7 +7,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/keys"
 	cskeys "github.com/cosmos/cosmos-sdk/crypto/keys"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
 	authtxb "github.com/cosmos/cosmos-sdk/x/auth/client/txbuilder"
 	"github.com/cybercongress/cyberd/app"
 	cbd "github.com/cybercongress/cyberd/app/types"
@@ -28,7 +27,7 @@ func InitAddLink() func([]Link) {
 	cdc := app.MakeCodec()
 	cliCtx := newCLIContext(name, chainId).
 		WithCodec(cdc).
-		WithAccountDecoder(authcmd.GetAccountDecoder(cdc))
+		WithAccountDecoder(cdc)
 
 	accountNumber, _ := cliCtx.GetAccountNumber(addr)
 	seq, _ := cliCtx.GetAccountSequence(addr)