I don't think you should add them in this patch. It just takes a broken concept (``single_pay_account()``) and makes it more broken. Eventually we need to delete ``single_pay_account()`` so by adding these extra methods we will then have to delete them too and all code that uses them.