Fix model association
Move payment info to Payment model