Added fields to Payment and Response