Added additional fields to Payment and Account object