Support for new wallet format