Added Bill and BillPayment to list of entities