Rework handling to a generic Entity class, add Payees.