Wallet locking support added