Port BillPayment class from v1