Added/Updated code for wallet.