Another step towards payment and invoicePayment APIs