Enhanced PaymentNotification Model