Adding support for payment method definitions and field definitions.