As commented before, would be perfect if we can move all that to Payment model, doable?