Change notifications to use payment_id