Adopted to new payment events.