I think it's pretty good now how it works with external wallets. I don't think this should be mixed because it will just add an additional attack surface.