Rewire payment method fields to map in correct array struct to rest of system