Updated to support wallet in user model.