Store the payment ID with the data object.
Use the payment ID instead of returning null.