Added whole-wallet support