Wallet wrapper in improvements