diff --git a/docs/fspiop-rest-v2.0-ISO20022-openapi3-snippets.yaml b/docs/fspiop-rest-v2.0-ISO20022-openapi3-snippets.yaml
index 5f8e73a..f001866 100644
--- a/docs/fspiop-rest-v2.0-ISO20022-openapi3-snippets.yaml
+++ b/docs/fspiop-rest-v2.0-ISO20022-openapi3-snippets.yaml
@@ -1439,13 +1439,182 @@ components:
     ActiveCurrencyCode:
       title: ActiveCurrencyCode
       type: string
-      pattern: ^[A-Z]{3,3}$
       description: >-
         A code allocated to a currency by a Maintenance Agency under an
         international identification scheme as described in the latest edition
         of the international standard ISO 4217 "Codes for the representation of
         currencies and funds".
+
+        NOTE: This has been modified away from the original ISO20022 pattern to
+        enums.
       example: USD
+      minLength: 3
+      maxLength: 3
+      enum:
+        - AED
+        - AFN
+        - ALL
+        - AMD
+        - ANG
+        - AOA
+        - ARS
+        - AUD
+        - AWG
+        - AZN
+        - BAM
+        - BBD
+        - BDT
+        - BGN
+        - BHD
+        - BIF
+        - BMD
+        - BND
+        - BOB
+        - BRL
+        - BSD
+        - BTN
+        - BWP
+        - BYN
+        - BZD
+        - CAD
+        - CDF
+        - CHF
+        - CLP
+        - CNY
+        - COP
+        - CRC
+        - CUC
+        - CUP
+        - CVE
+        - CZK
+        - DJF
+        - DKK
+        - DOP
+        - DZD
+        - EGP
+        - ERN
+        - ETB
+        - EUR
+        - FJD
+        - FKP
+        - GBP
+        - GEL
+        - GGP
+        - GHS
+        - GIP
+        - GMD
+        - GNF
+        - GTQ
+        - GYD
+        - HKD
+        - HNL
+        - HRK
+        - HTG
+        - HUF
+        - IDR
+        - ILS
+        - IMP
+        - INR
+        - IQD
+        - IRR
+        - ISK
+        - JEP
+        - JMD
+        - JOD
+        - JPY
+        - KES
+        - KGS
+        - KHR
+        - KMF
+        - KPW
+        - KRW
+        - KWD
+        - KYD
+        - KZT
+        - LAK
+        - LBP
+        - LKR
+        - LRD
+        - LSL
+        - LYD
+        - MAD
+        - MDL
+        - MGA
+        - MKD
+        - MMK
+        - MNT
+        - MOP
+        - MRO
+        - MUR
+        - MVR
+        - MWK
+        - MXN
+        - MYR
+        - MZN
+        - NAD
+        - NGN
+        - NIO
+        - NOK
+        - NPR
+        - NZD
+        - OMR
+        - PAB
+        - PEN
+        - PGK
+        - PHP
+        - PKR
+        - PLN
+        - PYG
+        - QAR
+        - RON
+        - RSD
+        - RUB
+        - RWF
+        - SAR
+        - SBD
+        - SCR
+        - SDG
+        - SEK
+        - SGD
+        - SHP
+        - SLL
+        - SOS
+        - SPL
+        - SRD
+        - STD
+        - SVC
+        - SYP
+        - SZL
+        - THB
+        - TJS
+        - TMT
+        - TND
+        - TOP
+        - TRY
+        - TTD
+        - TVD
+        - TWD
+        - TZS
+        - UAH
+        - UGX
+        - USD
+        - UYU
+        - UZS
+        - VEF
+        - VND
+        - VUV
+        - WST
+        - XAF
+        - XCD
+        - XDR
+        - XOF
+        - XPF
+        - XTS
+        - XXX
+        - YER
+        - ZAR
+        - ZMW
+        - ZWD
     ActiveOrHistoricCurrencyAndAmount:
       title: ActiveOrHistoricCurrencyAndAmount
       type: object
@@ -1487,8 +1656,177 @@ components:
         international identification scheme, as described in the latest edition
         of the international standard ISO 4217 "Codes for the representation of
         currencies and funds".
-      pattern: ^[A-Z]{3,3}$
+
+        NOTE: This has been modified away from the original ISO20022 pattern to
+        enums.
       example: USD
+      minLength: 3
+      maxLength: 3
+      enum:
+        - AED
+        - AFN
+        - ALL
+        - AMD
+        - ANG
+        - AOA
+        - ARS
+        - AUD
+        - AWG
+        - AZN
+        - BAM
+        - BBD
+        - BDT
+        - BGN
+        - BHD
+        - BIF
+        - BMD
+        - BND
+        - BOB
+        - BRL
+        - BSD
+        - BTN
+        - BWP
+        - BYN
+        - BZD
+        - CAD
+        - CDF
+        - CHF
+        - CLP
+        - CNY
+        - COP
+        - CRC
+        - CUC
+        - CUP
+        - CVE
+        - CZK
+        - DJF
+        - DKK
+        - DOP
+        - DZD
+        - EGP
+        - ERN
+        - ETB
+        - EUR
+        - FJD
+        - FKP
+        - GBP
+        - GEL
+        - GGP
+        - GHS
+        - GIP
+        - GMD
+        - GNF
+        - GTQ
+        - GYD
+        - HKD
+        - HNL
+        - HRK
+        - HTG
+        - HUF
+        - IDR
+        - ILS
+        - IMP
+        - INR
+        - IQD
+        - IRR
+        - ISK
+        - JEP
+        - JMD
+        - JOD
+        - JPY
+        - KES
+        - KGS
+        - KHR
+        - KMF
+        - KPW
+        - KRW
+        - KWD
+        - KYD
+        - KZT
+        - LAK
+        - LBP
+        - LKR
+        - LRD
+        - LSL
+        - LYD
+        - MAD
+        - MDL
+        - MGA
+        - MKD
+        - MMK
+        - MNT
+        - MOP
+        - MRO
+        - MUR
+        - MVR
+        - MWK
+        - MXN
+        - MYR
+        - MZN
+        - NAD
+        - NGN
+        - NIO
+        - NOK
+        - NPR
+        - NZD
+        - OMR
+        - PAB
+        - PEN
+        - PGK
+        - PHP
+        - PKR
+        - PLN
+        - PYG
+        - QAR
+        - RON
+        - RSD
+        - RUB
+        - RWF
+        - SAR
+        - SBD
+        - SCR
+        - SDG
+        - SEK
+        - SGD
+        - SHP
+        - SLL
+        - SOS
+        - SPL
+        - SRD
+        - STD
+        - SVC
+        - SYP
+        - SZL
+        - THB
+        - TJS
+        - TMT
+        - TND
+        - TOP
+        - TRY
+        - TTD
+        - TVD
+        - TWD
+        - TZS
+        - UAH
+        - UGX
+        - USD
+        - UYU
+        - UZS
+        - VEF
+        - VND
+        - VUV
+        - WST
+        - XAF
+        - XCD
+        - XDR
+        - XOF
+        - XPF
+        - XTS
+        - XXX
+        - YER
+        - ZAR
+        - ZMW
+        - ZWD
     AddressType2Code:
       description: |
         AddressType2Code
@@ -1534,6 +1872,16 @@ components:
             - Prtry
       example:
         Cd: ADDR
+    AmountTypeEnum:
+      title: AmountTypeEnum
+      description: |
+        NOTE: This pattern is not the original ISO20022 specification.
+              This represents the enum values when mapping to and from FSPIOP specification.
+      type: string
+      enum:
+        - SEND
+        - RECEIVE
+      example: SEND
     AnyBICDec2014Identifier:
       title: AnyBICDec2014Identifier
       type: string
@@ -2619,6 +2967,141 @@ components:
         VrfctnOfTerms:
           Cntt: CONTENT
           CnttTp: PROPRIETARY
+    CreditTransferTransaction68_Put_FX_Quotes_ID:
+      title: CreditTransferTransaction68_Put_FX_Quotes_ID
+      description: >
+        Provides further details specific to the individual transaction(s)
+        included in the message.
+      type: object
+      properties:
+        PmtId:
+          allOf:
+            - $ref: "#/components/schemas/PaymentIdentification13"
+            - description: |
+                PaymentIdentification
+                Set of elements used to reference a payment instruction.
+        PmtTpInf:
+          allOf:
+            - $ref: "#/components/schemas/PaymentTypeInformation28"
+            - description: |
+                PaymentTypeInformation
+                Set of elements used to further specify the type of transaction.
+        UndrlygCstmrCdtTrf:
+          allOf:
+            - $ref: "#/components/schemas/UnderlyingCustomerCreditTransfer"
+            - description: |
+                Underlying Customer Credit Transfer
+                TBD
+        IntrBkSttlmAmt:
+          allOf:
+            - $ref: "#/components/schemas/ActiveCurrencyAndAmount"
+            - description: >
+                InterbankSettlementAmount
+
+                Amount of money moved between the instructing agent and the
+                instructed agent.
+        Dbtr:
+          allOf:
+            - $ref: >-
+                #/components/schemas/BranchAndFinancialInstitutionIdentification8
+            - description: |
+                Debtor
+                Party that owes an amount of money to the (ultimate) creditor.
+        DbtrAcct:
+          allOf:
+            - $ref: "#/components/schemas/CashAccount40"
+            - description: |
+                DebtorAccount
+                Account used to process a payment.
+        DbtrAgt:
+          allOf:
+            - $ref: >-
+                #/components/schemas/BranchAndFinancialInstitutionIdentification8
+            - description: |
+                DebtorAgent
+                Financial institution servicing an account for the debtor.
+        CdtrAgt:
+          allOf:
+            - $ref: >-
+                #/components/schemas/BranchAndFinancialInstitutionIdentification8
+            - description: |
+                CreditorAgent
+                Financial institution servicing an account for the creditor.
+        Cdtr:
+          allOf:
+            - $ref: >-
+                #/components/schemas/BranchAndFinancialInstitutionIdentification8
+            - description: |
+                Creditor
+                Party to which an amount of money is due.
+        CdtrAcct:
+          allOf:
+            - $ref: "#/components/schemas/CashAccount40"
+            - description: |
+                CreditorAccount
+                Account to which a credit entry is made.
+        InstrForCdtrAgt:
+          allOf:
+            - $ref: >-
+                #/components/schemas/InstructionForCreditorAgent3_Put_FX_Quotes_ID
+            - description: >
+                InstructionForCreditorAgent
+
+                Set of elements used to provide information on the remittance
+                advice.
+        Purp:
+          allOf:
+            - $ref: "#/components/schemas/Purpose2Choice"
+            - description: |
+                Purpose
+                Underlying reason for the payment transaction.
+        VrfctnOfTerms:
+          allOf:
+            - $ref: "#/components/schemas/CryptographicLockChoice"
+            - description: >
+                VerificationOfTerms
+
+                Set of elements used to provide information on the underlying
+                terms of the transaction.
+      required:
+        - PmtId
+        - IntrBkSttlmAmt
+        - Dbtr
+        - Cdtr
+      example:
+        PmtId:
+          InstrId: INSTRID
+          EndToEndId: ENDTOENDID
+        PmtTpInf:
+          LclInstrm:
+            Cd: CHQB
+            Prtry: PROPRIETARY
+        IntrBkSttlmAmt:
+          Amount: 123.45
+          Ccy: EUR
+        Dbtr:
+          Nm: Debtor Name
+        DbtrAcct:
+          Id:
+            IBAN: IBAN
+        DbtrAgt:
+          FinInstnId:
+            BICFI: BICFI
+        CdtrAgt:
+          FinInstnId:
+            BICFI: BICFI
+        Cdtr:
+          Nm: Creditor Name
+        CdtrAcct:
+          Id:
+            IBAN: IBAN
+        InstrForCdtrAgt:
+          Cd: INSTRUCTION
+        Purp:
+          Cd: CHAR
+        VrfctnOfTerms:
+          Cntt: CONTENT
+          CnttTp: PROPRIETARY
     CryptographicLockChoice:
       title: CryptographicLockChoice
       description: |
@@ -2778,9 +3261,12 @@ components:
     Exact32HexBinaryText:
       title: Exact32HexBinaryText
       description: |
-        Specifies a hexadecimal string with a length of 32 characters.
+        Specifies a hexadecimal string.
+
+        NOTE: This pattern is not the original ISO20022 specification.
       type: string
-      example: 1234567890ABCDEF1234567890ABCDEF
+      pattern: ^[A-Za-z0-9-_]{43}$
+      maxLength: 48
     Exact4AlphaNumericText:
       title: Exact4AlphaNumericText
       description: |
@@ -2960,20 +3446,31 @@ components:
       example: 1234
     ExternalPaymentTransactionStatus1Code:
       title: ExternalPaymentTransactionStatus1Code
-      description: |
+      description: >
         Specifies the external payment transaction status code.
 
+
         For FSPIOP transfer state enumeration mappings:
+
         {
           "COMM": "COMMITED",
           "RESV": "RESERVED",
           "RECV": "RECEIVED",
           "ABOR": "ABORTED"
         }
+
+
+        NOTE: enum enforcement is not apart of the ISO20022 specification, but
+        is added here for FSPIOP mappings.
       type: string
       minLength: 1
       maxLength: 4
       example: COMM
+      enum:
+        - COMM
+        - RESV
+        - RECV
+        - ABOR
     ExternalPersonIdentification1Code:
       title: ExternalPersonIdentification1Code
       description: Specifies the external person identification code.
@@ -3318,9 +3815,10 @@ components:
                 included in the message.
         CdtTrfTxInf:
           allOf:
-            - $ref: "#/components/schemas/CreditTransferTransaction68"
+            - $ref: >-
+                #/components/schemas/CreditTransferTransaction68_Put_FX_Quotes_ID
             - description: >
-                CreditTransferTransactionInformation
+                CreditTransferTransaction68_Put_FX_Quotes_ID
 
                 Set of elements providing information specific to the individual
                 credit transfer(s).
@@ -4261,6 +4759,35 @@ components:
       example:
         Cd: PHOA
         InstrInf: Please advise/contact next agent by phone.
+    InstructionForCreditorAgent3_Put_FX_Quotes_ID:
+      title: InstructionForCreditorAgent3_Put_FX_Quotes_ID
+      description: >
+        Further information related to the processing of the payment
+        instruction, provided by the initiating party, and intended for the
+        creditor agent.
+      type: object
+      properties:
+        Cd:
+          allOf:
+            - $ref: "#/components/schemas/ExternalCreditorAgentInstruction1Code"
+            - description: >
+                Code
+
+                Coded information related to the processing of the payment
+                instruction, provided by the initiating party, and intended for
+                the creditor's agent.
+        InstrInf:
+          allOf:
+            - $ref: "#/components/schemas/AmountTypeEnum"
+            - description: >
+                InstructionInformation
+
+                Further information complementing the coded instruction or
+                instruction to the creditor's agent that is bilaterally agreed
+                or specific to a user community.
+      example:
+        Cd: PHOA
+        InstrInf: Please advise/contact next agent by phone.
     InstructionForNextAgent1:
       title: InstructionForNextAgent1
       description: >
@@ -4952,7 +5479,7 @@ components:
       properties:
         InstrId:
           allOf:
-            - $ref: "#/components/schemas/Max35Text"
+            - $ref: "#/components/schemas/ULIDIdentifier"
             - description: >
                 InstructionIdentification (FSPIOP equivalent:
                 transactionRequestId)
@@ -4971,9 +5498,13 @@ components:
                 individual instruction. It can be included in
 
                 several messages related to the instruction.
+
+
+                This field has been changed from the original ISO20022
+                `Max35Text`` schema to a ULIDIdentifier schema.
         EndToEndId:
           allOf:
-            - $ref: "#/components/schemas/Max35Text"
+            - $ref: "#/components/schemas/ULIDIdentifier"
             - description: >
                 EndToEndIdentification (FSPIOP equivalent: transactionId)
 
@@ -4997,9 +5528,13 @@ components:
 
                 identification must be passed on throughout the entire
                 end-to-end chain.
+
+
+                This field has been changed from the original ISO20022
+                `Max35Text`` schema to a ULIDIdentifier schema.
         TxId:
           allOf:
-            - $ref: "#/components/schemas/Max35Text"
+            - $ref: "#/components/schemas/ULIDIdentifier"
             - description: >
                 TransactionIdentification (FSPIOP equivalent: quoteId in quote
                 request, transferId in transfer request)
@@ -5020,6 +5555,10 @@ components:
 
                 Usage: The instructing agent has to make sure that the
                 transaction identification is unique for a preagreed period.
+
+
+                This field has been changed from the original ISO20022
+                `Max35Text`` schema to a ULIDIdentifier schema.
         UETR:
           allOf:
             - $ref: "#/components/schemas/UUIDv4Identifier"
@@ -6535,6 +7074,11 @@ components:
           FwdgAgt:
             FinInstnId:
               BICFI: BBBBBBBB
+    ULIDIdentifier:
+      title: ULIDIdentifier
+      type: string
+      pattern: ^[0-9A-HJKMNP-TV-Z]{26}$
+      example: 01AN4Z07BY79KA1307SR9X4MV3
     UUIDv4Identifier:
       title: UUIDv4Identifier
       type: string
diff --git a/fspiop/v2_0_ISO20022/openapi3/components/schemas/ActiveCurrencyCode.yaml b/fspiop/v2_0_ISO20022/openapi3/components/schemas/ActiveCurrencyCode.yaml
index a91a07d..28563c7 100644
--- a/fspiop/v2_0_ISO20022/openapi3/components/schemas/ActiveCurrencyCode.yaml
+++ b/fspiop/v2_0_ISO20022/openapi3/components/schemas/ActiveCurrencyCode.yaml
@@ -1,8 +1,176 @@
 title: ActiveCurrencyCode
 type: string
-pattern: ^[A-Z]{3,3}$
 description: >-
   A code allocated to a currency by a Maintenance Agency under an international
   identification scheme as described in the latest edition of the international standard ISO
   4217 "Codes for the representation of currencies and funds".
+
+  NOTE: This has been modified away from the original ISO20022 pattern to enums.
 example: USD
+minLength: 3
+maxLength: 3
+enum:
+  - AED
+  - AFN
+  - ALL
+  - AMD
+  - ANG
+  - AOA
+  - ARS
+  - AUD
+  - AWG
+  - AZN
+  - BAM
+  - BBD
+  - BDT
+  - BGN
+  - BHD
+  - BIF
+  - BMD
+  - BND
+  - BOB
+  - BRL
+  - BSD
+  - BTN
+  - BWP
+  - BYN
+  - BZD
+  - CAD
+  - CDF
+  - CHF
+  - CLP
+  - CNY
+  - COP
+  - CRC
+  - CUC
+  - CUP
+  - CVE
+  - CZK
+  - DJF
+  - DKK
+  - DOP
+  - DZD
+  - EGP
+  - ERN
+  - ETB
+  - EUR
+  - FJD
+  - FKP
+  - GBP
+  - GEL
+  - GGP
+  - GHS
+  - GIP
+  - GMD
+  - GNF
+  - GTQ
+  - GYD
+  - HKD
+  - HNL
+  - HRK
+  - HTG
+  - HUF
+  - IDR
+  - ILS
+  - IMP
+  - INR
+  - IQD
+  - IRR
+  - ISK
+  - JEP
+  - JMD
+  - JOD
+  - JPY
+  - KES
+  - KGS
+  - KHR
+  - KMF
+  - KPW
+  - KRW
+  - KWD
+  - KYD
+  - KZT
+  - LAK
+  - LBP
+  - LKR
+  - LRD
+  - LSL
+  - LYD
+  - MAD
+  - MDL
+  - MGA
+  - MKD
+  - MMK
+  - MNT
+  - MOP
+  - MRO
+  - MUR
+  - MVR
+  - MWK
+  - MXN
+  - MYR
+  - MZN
+  - NAD
+  - NGN
+  - NIO
+  - NOK
+  - NPR
+  - NZD
+  - OMR
+  - PAB
+  - PEN
+  - PGK
+  - PHP
+  - PKR
+  - PLN
+  - PYG
+  - QAR
+  - RON
+  - RSD
+  - RUB
+  - RWF
+  - SAR
+  - SBD
+  - SCR
+  - SDG
+  - SEK
+  - SGD
+  - SHP
+  - SLL
+  - SOS
+  - SPL
+  - SRD
+  - STD
+  - SVC
+  - SYP
+  - SZL
+  - THB
+  - TJS
+  - TMT
+  - TND
+  - TOP
+  - TRY
+  - TTD
+  - TVD
+  - TWD
+  - TZS
+  - UAH
+  - UGX
+  - USD
+  - UYU
+  - UZS
+  - VEF
+  - VND
+  - VUV
+  - WST
+  - XAF
+  - XCD
+  - XDR
+  - XOF
+  - XPF
+  - XTS
+  - XXX
+  - YER
+  - ZAR
+  - ZMW
+  - ZWD
diff --git a/fspiop/v2_0_ISO20022/openapi3/components/schemas/ActiveOrHistoricCurrencyCode.yaml b/fspiop/v2_0_ISO20022/openapi3/components/schemas/ActiveOrHistoricCurrencyCode.yaml
index b12118f..c2a0f98 100644
--- a/fspiop/v2_0_ISO20022/openapi3/components/schemas/ActiveOrHistoricCurrencyCode.yaml
+++ b/fspiop/v2_0_ISO20022/openapi3/components/schemas/ActiveOrHistoricCurrencyCode.yaml
@@ -4,5 +4,173 @@ description: >
   A code allocated to a currency by a Maintenance Agency under an international
   identification scheme, as described in the latest edition of the international standard ISO
   4217 "Codes for the representation of currencies and funds".
-pattern: ^[A-Z]{3,3}$
+
+  NOTE: This has been modified away from the original ISO20022 pattern to enums.
 example: USD
+minLength: 3
+maxLength: 3
+enum:
+  - AED
+  - AFN
+  - ALL
+  - AMD
+  - ANG
+  - AOA
+  - ARS
+  - AUD
+  - AWG
+  - AZN
+  - BAM
+  - BBD
+  - BDT
+  - BGN
+  - BHD
+  - BIF
+  - BMD
+  - BND
+  - BOB
+  - BRL
+  - BSD
+  - BTN
+  - BWP
+  - BYN
+  - BZD
+  - CAD
+  - CDF
+  - CHF
+  - CLP
+  - CNY
+  - COP
+  - CRC
+  - CUC
+  - CUP
+  - CVE
+  - CZK
+  - DJF
+  - DKK
+  - DOP
+  - DZD
+  - EGP
+  - ERN
+  - ETB
+  - EUR
+  - FJD
+  - FKP
+  - GBP
+  - GEL
+  - GGP
+  - GHS
+  - GIP
+  - GMD
+  - GNF
+  - GTQ
+  - GYD
+  - HKD
+  - HNL
+  - HRK
+  - HTG
+  - HUF
+  - IDR
+  - ILS
+  - IMP
+  - INR
+  - IQD
+  - IRR
+  - ISK
+  - JEP
+  - JMD
+  - JOD
+  - JPY
+  - KES
+  - KGS
+  - KHR
+  - KMF
+  - KPW
+  - KRW
+  - KWD
+  - KYD
+  - KZT
+  - LAK
+  - LBP
+  - LKR
+  - LRD
+  - LSL
+  - LYD
+  - MAD
+  - MDL
+  - MGA
+  - MKD
+  - MMK
+  - MNT
+  - MOP
+  - MRO
+  - MUR
+  - MVR
+  - MWK
+  - MXN
+  - MYR
+  - MZN
+  - NAD
+  - NGN
+  - NIO
+  - NOK
+  - NPR
+  - NZD
+  - OMR
+  - PAB
+  - PEN
+  - PGK
+  - PHP
+  - PKR
+  - PLN
+  - PYG
+  - QAR
+  - RON
+  - RSD
+  - RUB
+  - RWF
+  - SAR
+  - SBD
+  - SCR
+  - SDG
+  - SEK
+  - SGD
+  - SHP
+  - SLL
+  - SOS
+  - SPL
+  - SRD
+  - STD
+  - SVC
+  - SYP
+  - SZL
+  - THB
+  - TJS
+  - TMT
+  - TND
+  - TOP
+  - TRY
+  - TTD
+  - TVD
+  - TWD
+  - TZS
+  - UAH
+  - UGX
+  - USD
+  - UYU
+  - UZS
+  - VEF
+  - VND
+  - VUV
+  - WST
+  - XAF
+  - XCD
+  - XDR
+  - XOF
+  - XPF
+  - XTS
+  - XXX
+  - YER
+  - ZAR
+  - ZMW
+  - ZWD
diff --git a/fspiop/v2_0_ISO20022/openapi3/components/schemas/AmountTypeEnum.yaml b/fspiop/v2_0_ISO20022/openapi3/components/schemas/AmountTypeEnum.yaml
new file mode 100644
index 0000000..b41c8b1
--- /dev/null
+++ b/fspiop/v2_0_ISO20022/openapi3/components/schemas/AmountTypeEnum.yaml
@@ -0,0 +1,9 @@
+title: AmountTypeEnum
+description: |
+  NOTE: This pattern is not the original ISO20022 specification.
+        This represents the enum values when mapping to and from FSPIOP specification.
+type: string
+enum:
+  - SEND
+  - RECEIVE
+example: SEND
diff --git a/fspiop/v2_0_ISO20022/openapi3/components/schemas/CreditTransferTransaction68_Put_FX_Quotes_ID.yaml b/fspiop/v2_0_ISO20022/openapi3/components/schemas/CreditTransferTransaction68_Put_FX_Quotes_ID.yaml
new file mode 100644
index 0000000..f223c8e
--- /dev/null
+++ b/fspiop/v2_0_ISO20022/openapi3/components/schemas/CreditTransferTransaction68_Put_FX_Quotes_ID.yaml
@@ -0,0 +1,136 @@
+title: CreditTransferTransaction68_Put_FX_Quotes_ID
+description: >
+  Provides further details specific to the individual transaction(s) included in
+  the message.
+type: object
+properties:
+  PmtId:
+    allOf:
+      - $ref: ./PaymentIdentification13.yaml
+      - description: >
+          PaymentIdentification
+
+          Set of elements used to reference a payment instruction.
+  PmtTpInf:
+    allOf:
+      - $ref: ./PaymentTypeInformation28.yaml
+      - description: >
+          PaymentTypeInformation
+
+          Set of elements used to further specify the type of transaction.
+  UndrlygCstmrCdtTrf:
+    allOf:
+      - $ref: ./UnderlyingCustomerCreditTransfer.yaml
+      - description: >
+          Underlying Customer Credit Transfer
+
+          TBD
+  IntrBkSttlmAmt:
+    allOf:
+      - $ref: ./ActiveCurrencyAndAmount.yaml
+      - description: >
+          InterbankSettlementAmount
+
+          Amount of money moved between the instructing agent and the instructed agent.
+  Dbtr:
+    allOf:
+      - $ref: ./BranchAndFinancialInstitutionIdentification8.yaml
+      - description: >
+          Debtor
+
+          Party that owes an amount of money to the (ultimate) creditor.
+  DbtrAcct:
+    allOf:
+      - $ref: ./CashAccount40.yaml
+      - description: >
+          DebtorAccount
+
+          Account used to process a payment.
+  DbtrAgt:
+    allOf:
+      - $ref: ./BranchAndFinancialInstitutionIdentification8.yaml
+      - description: >
+          DebtorAgent
+
+          Financial institution servicing an account for the debtor.
+  CdtrAgt:
+    allOf:
+      - $ref: ./BranchAndFinancialInstitutionIdentification8.yaml
+      - description: >
+          CreditorAgent
+
+          Financial institution servicing an account for the creditor.
+  Cdtr:
+    allOf:
+      - $ref: ./BranchAndFinancialInstitutionIdentification8.yaml
+      - description: >
+          Creditor
+
+          Party to which an amount of money is due.
+  CdtrAcct:
+    allOf:
+      - $ref: ./CashAccount40.yaml
+      - description: >
+          CreditorAccount
+
+          Account to which a credit entry is made.
+  InstrForCdtrAgt:
+    allOf:
+      - $ref: ./InstructionForCreditorAgent3_Put_FX_Quotes_ID.yaml
+      - description: >
+          InstructionForCreditorAgent
+
+          Set of elements used to provide information on the remittance advice.
+  Purp:
+    allOf:
+      - $ref: ./Purpose2Choice.yaml
+      - description: >
+          Purpose
+
+          Underlying reason for the payment transaction.
+  VrfctnOfTerms:
+    allOf:
+      - $ref: ./CryptographicLockChoice.yaml
+      - description: >
+          VerificationOfTerms
+
+          Set of elements used to provide information on the underlying terms of the transaction.
+required:
+  - PmtId
+  - IntrBkSttlmAmt
+  - Dbtr
+  - Cdtr
+example:
+  PmtId:
+    InstrId: INSTRID
+    EndToEndId: ENDTOENDID
+  PmtTpInf:
+    LclInstrm:
+      Cd: CHQB
+      Prtry: PROPRIETARY
+  IntrBkSttlmAmt:
+    Amount: 123.45
+    Ccy: EUR
+  Dbtr:
+    Nm: Debtor Name
+  DbtrAcct:
+    Id:
+      IBAN: IBAN
+  DbtrAgt:
+    FinInstnId:
+      BICFI: BICFI
+  CdtrAgt:
+    FinInstnId:
+      BICFI: BICFI
+  Cdtr:
+    Nm: Creditor Name
+  CdtrAcct:
+    Id:
+      IBAN: IBAN
+  InstrForCdtrAgt:
+    Cd: INSTRUCTION
+  Purp:
+    Cd: CHAR
+  VrfctnOfTerms:
+    Cntt: CONTENT
+    CnttTp: PROPRIETARY
diff --git a/fspiop/v2_0_ISO20022/openapi3/components/schemas/Exact32HexBinaryText.yaml b/fspiop/v2_0_ISO20022/openapi3/components/schemas/Exact32HexBinaryText.yaml
index 7830560..e9da592 100644
--- a/fspiop/v2_0_ISO20022/openapi3/components/schemas/Exact32HexBinaryText.yaml
+++ b/fspiop/v2_0_ISO20022/openapi3/components/schemas/Exact32HexBinaryText.yaml
@@ -1,5 +1,8 @@
 title: Exact32HexBinaryText
 description: |
-  Specifies a hexadecimal string with a length of 32 characters.
+  Specifies a hexadecimal string.
+
+  NOTE: This pattern is not the original ISO20022 specification.
 type: string
-example: 1234567890ABCDEF1234567890ABCDEF
+pattern: '^[A-Za-z0-9-_]{43}$'
+maxLength: 48
diff --git a/fspiop/v2_0_ISO20022/openapi3/components/schemas/ExternalPaymentTransactionStatus1Code.yaml b/fspiop/v2_0_ISO20022/openapi3/components/schemas/ExternalPaymentTransactionStatus1Code.yaml
index f1cdb2f..306cd4a 100644
--- a/fspiop/v2_0_ISO20022/openapi3/components/schemas/ExternalPaymentTransactionStatus1Code.yaml
+++ b/fspiop/v2_0_ISO20022/openapi3/components/schemas/ExternalPaymentTransactionStatus1Code.yaml
@@ -9,7 +9,14 @@ description: |
     "RECV": "RECEIVED",
     "ABOR": "ABORTED"
   }
+
+  NOTE: enum enforcement is not apart of the ISO20022 specification, but is added here for FSPIOP mappings.
 type: string
 minLength: 1
 maxLength: 4
 example: COMM
+enum:
+  - COMM
+  - RESV
+  - RECV
+  - ABOR
diff --git a/fspiop/v2_0_ISO20022/openapi3/components/schemas/FxResponse_FICreditTransferConfirmation.yaml b/fspiop/v2_0_ISO20022/openapi3/components/schemas/FxResponse_FICreditTransferConfirmation.yaml
index 9af7ca1..2facbb1 100644
--- a/fspiop/v2_0_ISO20022/openapi3/components/schemas/FxResponse_FICreditTransferConfirmation.yaml
+++ b/fspiop/v2_0_ISO20022/openapi3/components/schemas/FxResponse_FICreditTransferConfirmation.yaml
@@ -14,9 +14,9 @@ properties:
           Set of characteristics shared by all individual transactions included in the message.
   CdtTrfTxInf:
     allOf:
-      - $ref: ./CreditTransferTransaction68.yaml
+      - $ref: ./CreditTransferTransaction68_Put_FX_Quotes_ID.yaml
       - description: >
-          CreditTransferTransactionInformation
+          CreditTransferTransaction68_Put_FX_Quotes_ID
 
           Set of elements providing information specific to the individual credit transfer(s).
 required:
diff --git a/fspiop/v2_0_ISO20022/openapi3/components/schemas/InstructionForCreditorAgent3.yaml b/fspiop/v2_0_ISO20022/openapi3/components/schemas/InstructionForCreditorAgent3.yaml
index f4221a3..d1841d0 100644
--- a/fspiop/v2_0_ISO20022/openapi3/components/schemas/InstructionForCreditorAgent3.yaml
+++ b/fspiop/v2_0_ISO20022/openapi3/components/schemas/InstructionForCreditorAgent3.yaml
@@ -22,4 +22,4 @@ properties:
           that is bilaterally agreed or specific to a user community.
 example:
   Cd: PHOA
-  InstrInf: Please advise/contact next agent by phone.
\ No newline at end of file
+  InstrInf: Please advise/contact next agent by phone.
diff --git a/fspiop/v2_0_ISO20022/openapi3/components/schemas/InstructionForCreditorAgent3_Put_FX_Quotes_ID.yaml b/fspiop/v2_0_ISO20022/openapi3/components/schemas/InstructionForCreditorAgent3_Put_FX_Quotes_ID.yaml
new file mode 100644
index 0000000..fa2950d
--- /dev/null
+++ b/fspiop/v2_0_ISO20022/openapi3/components/schemas/InstructionForCreditorAgent3_Put_FX_Quotes_ID.yaml
@@ -0,0 +1,25 @@
+title: InstructionForCreditorAgent3_Put_FX_Quotes_ID
+description: >
+  Further information related to the processing of the payment instruction,
+  provided by the initiating party, and intended for the creditor agent.
+type: object
+properties:
+  Cd:
+    allOf:
+      - $ref: ./ExternalCreditorAgentInstruction1Code.yaml
+      - description: >
+          Code
+
+          Coded information related to the processing of the payment instruction, provided by the
+          initiating party, and intended for the creditor's agent.
+  InstrInf:
+    allOf:
+      - $ref: ./AmountTypeEnum.yaml
+      - description: >
+          InstructionInformation
+
+          Further information complementing the coded instruction or instruction to the creditor's agent
+          that is bilaterally agreed or specific to a user community.
+example:
+  Cd: PHOA
+  InstrInf: Please advise/contact next agent by phone.
diff --git a/fspiop/v2_0_ISO20022/openapi3/components/schemas/PaymentIdentification13.yaml b/fspiop/v2_0_ISO20022/openapi3/components/schemas/PaymentIdentification13.yaml
index 4d16c9e..0fdaf0d 100644
--- a/fspiop/v2_0_ISO20022/openapi3/components/schemas/PaymentIdentification13.yaml
+++ b/fspiop/v2_0_ISO20022/openapi3/components/schemas/PaymentIdentification13.yaml
@@ -5,7 +5,7 @@ type: object
 properties:
   InstrId:
     allOf:
-      - $ref: ./Max35Text.yaml
+      - $ref: ./ULIDIdentifier.yaml
       - description: |
           InstructionIdentification (FSPIOP equivalent: transactionRequestId)
 
@@ -15,9 +15,11 @@ properties:
           Usage: The instruction identification is a point to point reference that can be used between the
           instructing party and the instructed party to refer to the individual instruction. It can be included in
           several messages related to the instruction.
+
+          This field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.
   EndToEndId:
     allOf:
-      - $ref: ./Max35Text.yaml
+      - $ref: ./ULIDIdentifier.yaml
       - description: |
           EndToEndIdentification (FSPIOP equivalent: transactionId)
 
@@ -29,9 +31,11 @@ properties:
 
           Usage: In case there are technical limitations to pass on multiple references, the end-to-end
           identification must be passed on throughout the entire end-to-end chain.
+
+          This field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.
   TxId:
     allOf:
-      - $ref: ./Max35Text.yaml
+      - $ref: ./ULIDIdentifier.yaml
       - description: |
           TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)
 
@@ -42,6 +46,8 @@ properties:
           the transaction on the interbank level.
 
           Usage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.
+
+          This field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.
   UETR:
     allOf:
       - $ref: ./UUIDv4Identifier.yaml
diff --git a/fspiop/v2_0_ISO20022/openapi3/components/schemas/ULIDIdentifier.yaml b/fspiop/v2_0_ISO20022/openapi3/components/schemas/ULIDIdentifier.yaml
new file mode 100644
index 0000000..b847834
--- /dev/null
+++ b/fspiop/v2_0_ISO20022/openapi3/components/schemas/ULIDIdentifier.yaml
@@ -0,0 +1,4 @@
+title: ULIDIdentifier
+type: string
+pattern: ^[0-9A-HJKMNP-TV-Z]{26}$
+example: 01AN4Z07BY79KA1307SR9X4MV3
diff --git a/package-lock.json b/package-lock.json
index fa8daf9..d8fa0fb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
         "js-yaml": "^4.1.0",
         "json-refs": "^3.0.15",
         "openapi-types": "^12.1.3",
-        "openapi-typescript": "^7.4.1",
+        "openapi-typescript": "^7.4.2",
         "ts-auto-mock": "^3.7.4"
       },
       "devDependencies": {
@@ -24,10 +24,10 @@
         "@commitlint/config-conventional": "^19.5.0",
         "@redocly/cli": "^1.5.0",
         "@redocly/openapi-cli": "^1.0.0-beta.95",
-        "@types/jest": "^29.5.13",
+        "@types/jest": "^29.5.14",
         "@types/js-yaml": "^4.0.9",
-        "@typescript-eslint/eslint-plugin": "^8.8.1",
-        "@typescript-eslint/parser": "^8.8.1",
+        "@typescript-eslint/eslint-plugin": "^8.12.2",
+        "@typescript-eslint/parser": "^8.12.2",
         "audit-ci": "^7.1.0",
         "browser-sync": "^3.0.3",
         "diff": "^7.0.0",
@@ -45,14 +45,14 @@
         "jest": "^29.7.0",
         "jest-junit": "^16.0.0",
         "lint-staged": "^15.2.10",
-        "npm-check-updates": "^17.1.3",
+        "npm-check-updates": "^17.1.9",
         "prettier": "^3.3.3",
         "standard-version": "^9.5.0",
         "swagger-cli": "^4.0.4",
         "ts-jest": "^29.2.5",
         "ts-node": "^10.9.2",
         "ts-patch": "^3.2.1",
-        "tslib": "^2.7.0",
+        "tslib": "^2.8.0",
         "typescript": "^5.6.3"
       }
     },
@@ -2601,9 +2601,9 @@
       }
     },
     "node_modules/@types/jest": {
-      "version": "29.5.13",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.13.tgz",
-      "integrity": "sha512-wd+MVEZCHt23V0/L642O5APvspWply/rGY5BcW4SUETo2UzPU3Z26qr8jC2qxpimI2jjx9h7+2cj2FwIr01bXg==",
+      "version": "29.5.14",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",
+      "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",
       "dev": true,
       "dependencies": {
         "expect": "^29.0.0",
@@ -2679,17 +2679,16 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.8.1.tgz",
-      "integrity": "sha512-xfvdgA8AP/vxHgtgU310+WBnLB4uJQ9XdyP17RebG26rLtDrQJV3ZYrcopX91GrHmMoH8bdSwMRh2a//TiJ1jQ==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.12.2.tgz",
+      "integrity": "sha512-gQxbxM8mcxBwaEmWdtLCIGLfixBMHhQjBqR8sVWNTPpcj45WlYL2IObS/DNMLH1DBP0n8qz+aiiLTGfopPEebw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.8.1",
-        "@typescript-eslint/type-utils": "8.8.1",
-        "@typescript-eslint/utils": "8.8.1",
-        "@typescript-eslint/visitor-keys": "8.8.1",
+        "@typescript-eslint/scope-manager": "8.12.2",
+        "@typescript-eslint/type-utils": "8.12.2",
+        "@typescript-eslint/utils": "8.12.2",
+        "@typescript-eslint/visitor-keys": "8.12.2",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -2713,16 +2712,15 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.8.1.tgz",
-      "integrity": "sha512-hQUVn2Lij2NAxVFEdvIGxT9gP1tq2yM83m+by3whWFsWC+1y8pxxxHUFE1UqDu2VsGi2i6RLcv4QvouM84U+ow==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.12.2.tgz",
+      "integrity": "sha512-MrvlXNfGPLH3Z+r7Tk+Z5moZAc0dzdVjTgUgwsdGweH7lydysQsnSww3nAmsq8blFuRD5VRlAr9YdEFw3e6PBw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.8.1",
-        "@typescript-eslint/types": "8.8.1",
-        "@typescript-eslint/typescript-estree": "8.8.1",
-        "@typescript-eslint/visitor-keys": "8.8.1",
+        "@typescript-eslint/scope-manager": "8.12.2",
+        "@typescript-eslint/types": "8.12.2",
+        "@typescript-eslint/typescript-estree": "8.12.2",
+        "@typescript-eslint/visitor-keys": "8.12.2",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -2742,14 +2740,13 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.8.1.tgz",
-      "integrity": "sha512-X4JdU+66Mazev/J0gfXlcC/dV6JI37h+93W9BRYXrSn0hrE64IoWgVkO9MSJgEzoWkxONgaQpICWg8vAN74wlA==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.12.2.tgz",
+      "integrity": "sha512-gPLpLtrj9aMHOvxJkSbDBmbRuYdtiEbnvO25bCMza3DhMjTQw0u7Y1M+YR5JPbMsXXnSPuCf5hfq0nEkQDL/JQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.8.1",
-        "@typescript-eslint/visitor-keys": "8.8.1"
+        "@typescript-eslint/types": "8.12.2",
+        "@typescript-eslint/visitor-keys": "8.12.2"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2760,14 +2757,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.8.1.tgz",
-      "integrity": "sha512-qSVnpcbLP8CALORf0za+vjLYj1Wp8HSoiI8zYU5tHxRVj30702Z1Yw4cLwfNKhTPWp5+P+k1pjmD5Zd1nhxiZA==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.12.2.tgz",
+      "integrity": "sha512-bwuU4TAogPI+1q/IJSKuD4shBLc/d2vGcRT588q+jzayQyjVK2X6v/fbR4InY2U2sgf8MEvVCqEWUzYzgBNcGQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.8.1",
-        "@typescript-eslint/utils": "8.8.1",
+        "@typescript-eslint/typescript-estree": "8.12.2",
+        "@typescript-eslint/utils": "8.12.2",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
@@ -2785,11 +2781,10 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.8.1.tgz",
-      "integrity": "sha512-WCcTP4SDXzMd23N27u66zTKMuEevH4uzU8C9jf0RO4E04yVHgQgW+r+TeVTNnO1KIfrL8ebgVVYYMMO3+jC55Q==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.12.2.tgz",
+      "integrity": "sha512-VwDwMF1SZ7wPBUZwmMdnDJ6sIFk4K4s+ALKLP6aIQsISkPv8jhiw65sAK6SuWODN/ix+m+HgbYDkH+zLjrzvOA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -2799,14 +2794,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.8.1.tgz",
-      "integrity": "sha512-A5d1R9p+X+1js4JogdNilDuuq+EHZdsH9MjTVxXOdVFfTJXunKJR/v+fNNyO4TnoOn5HqobzfRlc70NC6HTcdg==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.12.2.tgz",
+      "integrity": "sha512-mME5MDwGe30Pq9zKPvyduyU86PH7aixwqYR2grTglAdB+AN8xXQ1vFGpYaUSJ5o5P/5znsSBeNcs5g5/2aQwow==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/types": "8.8.1",
-        "@typescript-eslint/visitor-keys": "8.8.1",
+        "@typescript-eslint/types": "8.12.2",
+        "@typescript-eslint/visitor-keys": "8.12.2",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -2832,7 +2826,6 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
       "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -2842,7 +2835,6 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
       "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -2854,16 +2846,15 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.8.1.tgz",
-      "integrity": "sha512-/QkNJDbV0bdL7H7d0/y0qBbV2HTtf0TIyjSDTvvmQEzeVx8jEImEbLuOA4EsvE8gIgqMitns0ifb5uQhMj8d9w==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.12.2.tgz",
+      "integrity": "sha512-UTTuDIX3fkfAz6iSVa5rTuSfWIYZ6ATtEocQ/umkRSyC9O919lbZ8dcH7mysshrCdrAM03skJOEYaBugxN+M6A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.8.1",
-        "@typescript-eslint/types": "8.8.1",
-        "@typescript-eslint/typescript-estree": "8.8.1"
+        "@typescript-eslint/scope-manager": "8.12.2",
+        "@typescript-eslint/types": "8.12.2",
+        "@typescript-eslint/typescript-estree": "8.12.2"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2877,13 +2868,12 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.8.1.tgz",
-      "integrity": "sha512-0/TdC3aeRAsW7MDvYRwEc1Uwm0TIBfzjPFgg60UU2Haj5qsCs9cc3zNgY71edqE3LbWfF/WoZQd3lJoDXFQpag==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.12.2.tgz",
+      "integrity": "sha512-PChz8UaKQAVNHghsHcPyx1OMHoFRUEA7rJSK/mDhdq85bk+PLsUHUBqTQTFt18VJZbmxBovM65fezlheQRsSDA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.8.1",
+        "@typescript-eslint/types": "8.12.2",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -9422,9 +9412,9 @@
       }
     },
     "node_modules/npm-check-updates": {
-      "version": "17.1.3",
-      "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-17.1.3.tgz",
-      "integrity": "sha512-4uDLBWPuDHT5KLieIJ20FoAB8yqJejmupI42wPyfObgQOBbPAikQSwT73afDwREvhuxYrRDqlRvxTMSfvO+L8A==",
+      "version": "17.1.9",
+      "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-17.1.9.tgz",
+      "integrity": "sha512-Gfv5S8NNJKTilM1gesFNYka6bUaBs5LnVyPjApXPQphHijrlLFDMw1uSmwYMZbvJSkLZSOx03e8CHcG0Td5SMA==",
       "dev": true,
       "bin": {
         "ncu": "build/cli.js",
@@ -9689,9 +9679,9 @@
       "integrity": "sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw=="
     },
     "node_modules/openapi-typescript": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/openapi-typescript/-/openapi-typescript-7.4.1.tgz",
-      "integrity": "sha512-HrRoWveViADezHCNgQqZmPKmQ74q7nuH/yg9ursFucZaYQNUqsX38fE/V2sKBHVM+pws4tAHpuh/ext2UJ/AoQ==",
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/openapi-typescript/-/openapi-typescript-7.4.2.tgz",
+      "integrity": "sha512-SvhmSTItcEAdDUcz+wzrcg6OENpMRkHqqY2hZB01FT+NOfgLcZ1B1ML6vcQrnipONHtG9AQELiKHgGTjpNGjiQ==",
       "dependencies": {
         "@redocly/openapi-core": "^1.25.3",
         "ansi-colors": "^4.1.3",
@@ -12480,9 +12470,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
-      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
+      "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==",
       "dev": true
     },
     "node_modules/type-check": {
@@ -15108,9 +15098,9 @@
       }
     },
     "@types/jest": {
-      "version": "29.5.13",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.13.tgz",
-      "integrity": "sha512-wd+MVEZCHt23V0/L642O5APvspWply/rGY5BcW4SUETo2UzPU3Z26qr8jC2qxpimI2jjx9h7+2cj2FwIr01bXg==",
+      "version": "29.5.14",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",
+      "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",
       "dev": true,
       "requires": {
         "expect": "^29.0.0",
@@ -15186,16 +15176,16 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.8.1.tgz",
-      "integrity": "sha512-xfvdgA8AP/vxHgtgU310+WBnLB4uJQ9XdyP17RebG26rLtDrQJV3ZYrcopX91GrHmMoH8bdSwMRh2a//TiJ1jQ==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.12.2.tgz",
+      "integrity": "sha512-gQxbxM8mcxBwaEmWdtLCIGLfixBMHhQjBqR8sVWNTPpcj45WlYL2IObS/DNMLH1DBP0n8qz+aiiLTGfopPEebw==",
       "dev": true,
       "requires": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.8.1",
-        "@typescript-eslint/type-utils": "8.8.1",
-        "@typescript-eslint/utils": "8.8.1",
-        "@typescript-eslint/visitor-keys": "8.8.1",
+        "@typescript-eslint/scope-manager": "8.12.2",
+        "@typescript-eslint/type-utils": "8.12.2",
+        "@typescript-eslint/utils": "8.12.2",
+        "@typescript-eslint/visitor-keys": "8.12.2",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -15203,54 +15193,54 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.8.1.tgz",
-      "integrity": "sha512-hQUVn2Lij2NAxVFEdvIGxT9gP1tq2yM83m+by3whWFsWC+1y8pxxxHUFE1UqDu2VsGi2i6RLcv4QvouM84U+ow==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.12.2.tgz",
+      "integrity": "sha512-MrvlXNfGPLH3Z+r7Tk+Z5moZAc0dzdVjTgUgwsdGweH7lydysQsnSww3nAmsq8blFuRD5VRlAr9YdEFw3e6PBw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "8.8.1",
-        "@typescript-eslint/types": "8.8.1",
-        "@typescript-eslint/typescript-estree": "8.8.1",
-        "@typescript-eslint/visitor-keys": "8.8.1",
+        "@typescript-eslint/scope-manager": "8.12.2",
+        "@typescript-eslint/types": "8.12.2",
+        "@typescript-eslint/typescript-estree": "8.12.2",
+        "@typescript-eslint/visitor-keys": "8.12.2",
         "debug": "^4.3.4"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.8.1.tgz",
-      "integrity": "sha512-X4JdU+66Mazev/J0gfXlcC/dV6JI37h+93W9BRYXrSn0hrE64IoWgVkO9MSJgEzoWkxONgaQpICWg8vAN74wlA==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.12.2.tgz",
+      "integrity": "sha512-gPLpLtrj9aMHOvxJkSbDBmbRuYdtiEbnvO25bCMza3DhMjTQw0u7Y1M+YR5JPbMsXXnSPuCf5hfq0nEkQDL/JQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "8.8.1",
-        "@typescript-eslint/visitor-keys": "8.8.1"
+        "@typescript-eslint/types": "8.12.2",
+        "@typescript-eslint/visitor-keys": "8.12.2"
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.8.1.tgz",
-      "integrity": "sha512-qSVnpcbLP8CALORf0za+vjLYj1Wp8HSoiI8zYU5tHxRVj30702Z1Yw4cLwfNKhTPWp5+P+k1pjmD5Zd1nhxiZA==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.12.2.tgz",
+      "integrity": "sha512-bwuU4TAogPI+1q/IJSKuD4shBLc/d2vGcRT588q+jzayQyjVK2X6v/fbR4InY2U2sgf8MEvVCqEWUzYzgBNcGQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "8.8.1",
-        "@typescript-eslint/utils": "8.8.1",
+        "@typescript-eslint/typescript-estree": "8.12.2",
+        "@typescript-eslint/utils": "8.12.2",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       }
     },
     "@typescript-eslint/types": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.8.1.tgz",
-      "integrity": "sha512-WCcTP4SDXzMd23N27u66zTKMuEevH4uzU8C9jf0RO4E04yVHgQgW+r+TeVTNnO1KIfrL8ebgVVYYMMO3+jC55Q==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.12.2.tgz",
+      "integrity": "sha512-VwDwMF1SZ7wPBUZwmMdnDJ6sIFk4K4s+ALKLP6aIQsISkPv8jhiw65sAK6SuWODN/ix+m+HgbYDkH+zLjrzvOA==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.8.1.tgz",
-      "integrity": "sha512-A5d1R9p+X+1js4JogdNilDuuq+EHZdsH9MjTVxXOdVFfTJXunKJR/v+fNNyO4TnoOn5HqobzfRlc70NC6HTcdg==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.12.2.tgz",
+      "integrity": "sha512-mME5MDwGe30Pq9zKPvyduyU86PH7aixwqYR2grTglAdB+AN8xXQ1vFGpYaUSJ5o5P/5znsSBeNcs5g5/2aQwow==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "8.8.1",
-        "@typescript-eslint/visitor-keys": "8.8.1",
+        "@typescript-eslint/types": "8.12.2",
+        "@typescript-eslint/visitor-keys": "8.12.2",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -15280,24 +15270,24 @@
       }
     },
     "@typescript-eslint/utils": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.8.1.tgz",
-      "integrity": "sha512-/QkNJDbV0bdL7H7d0/y0qBbV2HTtf0TIyjSDTvvmQEzeVx8jEImEbLuOA4EsvE8gIgqMitns0ifb5uQhMj8d9w==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.12.2.tgz",
+      "integrity": "sha512-UTTuDIX3fkfAz6iSVa5rTuSfWIYZ6ATtEocQ/umkRSyC9O919lbZ8dcH7mysshrCdrAM03skJOEYaBugxN+M6A==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.8.1",
-        "@typescript-eslint/types": "8.8.1",
-        "@typescript-eslint/typescript-estree": "8.8.1"
+        "@typescript-eslint/scope-manager": "8.12.2",
+        "@typescript-eslint/types": "8.12.2",
+        "@typescript-eslint/typescript-estree": "8.12.2"
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.8.1.tgz",
-      "integrity": "sha512-0/TdC3aeRAsW7MDvYRwEc1Uwm0TIBfzjPFgg60UU2Haj5qsCs9cc3zNgY71edqE3LbWfF/WoZQd3lJoDXFQpag==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.12.2.tgz",
+      "integrity": "sha512-PChz8UaKQAVNHghsHcPyx1OMHoFRUEA7rJSK/mDhdq85bk+PLsUHUBqTQTFt18VJZbmxBovM65fezlheQRsSDA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "8.8.1",
+        "@typescript-eslint/types": "8.12.2",
         "eslint-visitor-keys": "^3.4.3"
       }
     },
@@ -20044,9 +20034,9 @@
       "dev": true
     },
     "npm-check-updates": {
-      "version": "17.1.3",
-      "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-17.1.3.tgz",
-      "integrity": "sha512-4uDLBWPuDHT5KLieIJ20FoAB8yqJejmupI42wPyfObgQOBbPAikQSwT73afDwREvhuxYrRDqlRvxTMSfvO+L8A==",
+      "version": "17.1.9",
+      "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-17.1.9.tgz",
+      "integrity": "sha512-Gfv5S8NNJKTilM1gesFNYka6bUaBs5LnVyPjApXPQphHijrlLFDMw1uSmwYMZbvJSkLZSOx03e8CHcG0Td5SMA==",
       "dev": true
     },
     "npm-run-path": {
@@ -20243,9 +20233,9 @@
       "integrity": "sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw=="
     },
     "openapi-typescript": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/openapi-typescript/-/openapi-typescript-7.4.1.tgz",
-      "integrity": "sha512-HrRoWveViADezHCNgQqZmPKmQ74q7nuH/yg9ursFucZaYQNUqsX38fE/V2sKBHVM+pws4tAHpuh/ext2UJ/AoQ==",
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/openapi-typescript/-/openapi-typescript-7.4.2.tgz",
+      "integrity": "sha512-SvhmSTItcEAdDUcz+wzrcg6OENpMRkHqqY2hZB01FT+NOfgLcZ1B1ML6vcQrnipONHtG9AQELiKHgGTjpNGjiQ==",
       "requires": {
         "@redocly/openapi-core": "^1.25.3",
         "ansi-colors": "^4.1.3",
@@ -22312,9 +22302,9 @@
       }
     },
     "tslib": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
-      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
+      "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==",
       "dev": true
     },
     "type-check": {
diff --git a/package.json b/package.json
index 12cf08d..4352069 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "js-yaml": "^4.1.0",
     "json-refs": "^3.0.15",
     "openapi-types": "^12.1.3",
-    "openapi-typescript": "^7.4.1",
+    "openapi-typescript": "^7.4.2",
     "ts-auto-mock": "^3.7.4"
   },
   "overrides": {
@@ -98,10 +98,10 @@
     "@commitlint/config-conventional": "^19.5.0",
     "@redocly/openapi-cli": "^1.0.0-beta.95",
     "@redocly/cli": "^1.5.0",
-    "@types/jest": "^29.5.13",
+    "@types/jest": "^29.5.14",
     "@types/js-yaml": "^4.0.9",
-    "@typescript-eslint/eslint-plugin": "^8.8.1",
-    "@typescript-eslint/parser": "^8.8.1",
+    "@typescript-eslint/eslint-plugin": "^8.12.2",
+    "@typescript-eslint/parser": "^8.12.2",
     "audit-ci": "^7.1.0",
     "browser-sync": "^3.0.3",
     "diff": "^7.0.0",
@@ -119,14 +119,14 @@
     "jest": "^29.7.0",
     "jest-junit": "^16.0.0",
     "lint-staged": "^15.2.10",
-    "npm-check-updates": "^17.1.3",
+    "npm-check-updates": "^17.1.9",
     "prettier": "^3.3.3",
     "standard-version": "^9.5.0",
     "swagger-cli": "^4.0.4",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
     "ts-patch": "^3.2.1",
-    "tslib": "^2.7.0",
+    "tslib": "^2.8.0",
     "typescript": "^5.6.3"
   },
   "publishConfig": {
diff --git a/src/fspiop/v2_0_ISO20022/json-schemas.json b/src/fspiop/v2_0_ISO20022/json-schemas.json
index 48cdb28..76df5ed 100644
--- a/src/fspiop/v2_0_ISO20022/json-schemas.json
+++ b/src/fspiop/v2_0_ISO20022/json-schemas.json
@@ -226,9 +226,176 @@
           {
             "title": "ActiveCurrencyCode",
             "type": "string",
-            "pattern": "^[A-Z]{3,3}$",
-            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".",
-            "example": "USD"
+            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.",
+            "example": "USD",
+            "minLength": 3,
+            "maxLength": 3,
+            "enum": [
+              "AED",
+              "AFN",
+              "ALL",
+              "AMD",
+              "ANG",
+              "AOA",
+              "ARS",
+              "AUD",
+              "AWG",
+              "AZN",
+              "BAM",
+              "BBD",
+              "BDT",
+              "BGN",
+              "BHD",
+              "BIF",
+              "BMD",
+              "BND",
+              "BOB",
+              "BRL",
+              "BSD",
+              "BTN",
+              "BWP",
+              "BYN",
+              "BZD",
+              "CAD",
+              "CDF",
+              "CHF",
+              "CLP",
+              "CNY",
+              "COP",
+              "CRC",
+              "CUC",
+              "CUP",
+              "CVE",
+              "CZK",
+              "DJF",
+              "DKK",
+              "DOP",
+              "DZD",
+              "EGP",
+              "ERN",
+              "ETB",
+              "EUR",
+              "FJD",
+              "FKP",
+              "GBP",
+              "GEL",
+              "GGP",
+              "GHS",
+              "GIP",
+              "GMD",
+              "GNF",
+              "GTQ",
+              "GYD",
+              "HKD",
+              "HNL",
+              "HRK",
+              "HTG",
+              "HUF",
+              "IDR",
+              "ILS",
+              "IMP",
+              "INR",
+              "IQD",
+              "IRR",
+              "ISK",
+              "JEP",
+              "JMD",
+              "JOD",
+              "JPY",
+              "KES",
+              "KGS",
+              "KHR",
+              "KMF",
+              "KPW",
+              "KRW",
+              "KWD",
+              "KYD",
+              "KZT",
+              "LAK",
+              "LBP",
+              "LKR",
+              "LRD",
+              "LSL",
+              "LYD",
+              "MAD",
+              "MDL",
+              "MGA",
+              "MKD",
+              "MMK",
+              "MNT",
+              "MOP",
+              "MRO",
+              "MUR",
+              "MVR",
+              "MWK",
+              "MXN",
+              "MYR",
+              "MZN",
+              "NAD",
+              "NGN",
+              "NIO",
+              "NOK",
+              "NPR",
+              "NZD",
+              "OMR",
+              "PAB",
+              "PEN",
+              "PGK",
+              "PHP",
+              "PKR",
+              "PLN",
+              "PYG",
+              "QAR",
+              "RON",
+              "RSD",
+              "RUB",
+              "RWF",
+              "SAR",
+              "SBD",
+              "SCR",
+              "SDG",
+              "SEK",
+              "SGD",
+              "SHP",
+              "SLL",
+              "SOS",
+              "SPL",
+              "SRD",
+              "STD",
+              "SVC",
+              "SYP",
+              "SZL",
+              "THB",
+              "TJS",
+              "TMT",
+              "TND",
+              "TOP",
+              "TRY",
+              "TTD",
+              "TVD",
+              "TWD",
+              "TZS",
+              "UAH",
+              "UGX",
+              "USD",
+              "UYU",
+              "UZS",
+              "VEF",
+              "VND",
+              "VUV",
+              "WST",
+              "XAF",
+              "XCD",
+              "XDR",
+              "XOF",
+              "XPF",
+              "XTS",
+              "XXX",
+              "YER",
+              "ZAR",
+              "ZMW",
+              "ZWD"
+            ]
           },
           {
             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -254,9 +421,176 @@
   "ActiveCurrencyCode": {
     "title": "ActiveCurrencyCode",
     "type": "string",
-    "pattern": "^[A-Z]{3,3}$",
-    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".",
-    "example": "USD"
+    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.",
+    "example": "USD",
+    "minLength": 3,
+    "maxLength": 3,
+    "enum": [
+      "AED",
+      "AFN",
+      "ALL",
+      "AMD",
+      "ANG",
+      "AOA",
+      "ARS",
+      "AUD",
+      "AWG",
+      "AZN",
+      "BAM",
+      "BBD",
+      "BDT",
+      "BGN",
+      "BHD",
+      "BIF",
+      "BMD",
+      "BND",
+      "BOB",
+      "BRL",
+      "BSD",
+      "BTN",
+      "BWP",
+      "BYN",
+      "BZD",
+      "CAD",
+      "CDF",
+      "CHF",
+      "CLP",
+      "CNY",
+      "COP",
+      "CRC",
+      "CUC",
+      "CUP",
+      "CVE",
+      "CZK",
+      "DJF",
+      "DKK",
+      "DOP",
+      "DZD",
+      "EGP",
+      "ERN",
+      "ETB",
+      "EUR",
+      "FJD",
+      "FKP",
+      "GBP",
+      "GEL",
+      "GGP",
+      "GHS",
+      "GIP",
+      "GMD",
+      "GNF",
+      "GTQ",
+      "GYD",
+      "HKD",
+      "HNL",
+      "HRK",
+      "HTG",
+      "HUF",
+      "IDR",
+      "ILS",
+      "IMP",
+      "INR",
+      "IQD",
+      "IRR",
+      "ISK",
+      "JEP",
+      "JMD",
+      "JOD",
+      "JPY",
+      "KES",
+      "KGS",
+      "KHR",
+      "KMF",
+      "KPW",
+      "KRW",
+      "KWD",
+      "KYD",
+      "KZT",
+      "LAK",
+      "LBP",
+      "LKR",
+      "LRD",
+      "LSL",
+      "LYD",
+      "MAD",
+      "MDL",
+      "MGA",
+      "MKD",
+      "MMK",
+      "MNT",
+      "MOP",
+      "MRO",
+      "MUR",
+      "MVR",
+      "MWK",
+      "MXN",
+      "MYR",
+      "MZN",
+      "NAD",
+      "NGN",
+      "NIO",
+      "NOK",
+      "NPR",
+      "NZD",
+      "OMR",
+      "PAB",
+      "PEN",
+      "PGK",
+      "PHP",
+      "PKR",
+      "PLN",
+      "PYG",
+      "QAR",
+      "RON",
+      "RSD",
+      "RUB",
+      "RWF",
+      "SAR",
+      "SBD",
+      "SCR",
+      "SDG",
+      "SEK",
+      "SGD",
+      "SHP",
+      "SLL",
+      "SOS",
+      "SPL",
+      "SRD",
+      "STD",
+      "SVC",
+      "SYP",
+      "SZL",
+      "THB",
+      "TJS",
+      "TMT",
+      "TND",
+      "TOP",
+      "TRY",
+      "TTD",
+      "TVD",
+      "TWD",
+      "TZS",
+      "UAH",
+      "UGX",
+      "USD",
+      "UYU",
+      "UZS",
+      "VEF",
+      "VND",
+      "VUV",
+      "WST",
+      "XAF",
+      "XCD",
+      "XDR",
+      "XOF",
+      "XPF",
+      "XTS",
+      "XXX",
+      "YER",
+      "ZAR",
+      "ZMW",
+      "ZWD"
+    ]
   },
   "ActiveOrHistoricCurrencyAndAmount": {
     "title": "ActiveOrHistoricCurrencyAndAmount",
@@ -281,9 +615,176 @@
           {
             "title": "ActiveOrHistoricCurrencyCode",
             "type": "string",
-            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-            "pattern": "^[A-Z]{3,3}$",
-            "example": "USD"
+            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+            "example": "USD",
+            "minLength": 3,
+            "maxLength": 3,
+            "enum": [
+              "AED",
+              "AFN",
+              "ALL",
+              "AMD",
+              "ANG",
+              "AOA",
+              "ARS",
+              "AUD",
+              "AWG",
+              "AZN",
+              "BAM",
+              "BBD",
+              "BDT",
+              "BGN",
+              "BHD",
+              "BIF",
+              "BMD",
+              "BND",
+              "BOB",
+              "BRL",
+              "BSD",
+              "BTN",
+              "BWP",
+              "BYN",
+              "BZD",
+              "CAD",
+              "CDF",
+              "CHF",
+              "CLP",
+              "CNY",
+              "COP",
+              "CRC",
+              "CUC",
+              "CUP",
+              "CVE",
+              "CZK",
+              "DJF",
+              "DKK",
+              "DOP",
+              "DZD",
+              "EGP",
+              "ERN",
+              "ETB",
+              "EUR",
+              "FJD",
+              "FKP",
+              "GBP",
+              "GEL",
+              "GGP",
+              "GHS",
+              "GIP",
+              "GMD",
+              "GNF",
+              "GTQ",
+              "GYD",
+              "HKD",
+              "HNL",
+              "HRK",
+              "HTG",
+              "HUF",
+              "IDR",
+              "ILS",
+              "IMP",
+              "INR",
+              "IQD",
+              "IRR",
+              "ISK",
+              "JEP",
+              "JMD",
+              "JOD",
+              "JPY",
+              "KES",
+              "KGS",
+              "KHR",
+              "KMF",
+              "KPW",
+              "KRW",
+              "KWD",
+              "KYD",
+              "KZT",
+              "LAK",
+              "LBP",
+              "LKR",
+              "LRD",
+              "LSL",
+              "LYD",
+              "MAD",
+              "MDL",
+              "MGA",
+              "MKD",
+              "MMK",
+              "MNT",
+              "MOP",
+              "MRO",
+              "MUR",
+              "MVR",
+              "MWK",
+              "MXN",
+              "MYR",
+              "MZN",
+              "NAD",
+              "NGN",
+              "NIO",
+              "NOK",
+              "NPR",
+              "NZD",
+              "OMR",
+              "PAB",
+              "PEN",
+              "PGK",
+              "PHP",
+              "PKR",
+              "PLN",
+              "PYG",
+              "QAR",
+              "RON",
+              "RSD",
+              "RUB",
+              "RWF",
+              "SAR",
+              "SBD",
+              "SCR",
+              "SDG",
+              "SEK",
+              "SGD",
+              "SHP",
+              "SLL",
+              "SOS",
+              "SPL",
+              "SRD",
+              "STD",
+              "SVC",
+              "SYP",
+              "SZL",
+              "THB",
+              "TJS",
+              "TMT",
+              "TND",
+              "TOP",
+              "TRY",
+              "TTD",
+              "TVD",
+              "TWD",
+              "TZS",
+              "UAH",
+              "UGX",
+              "USD",
+              "UYU",
+              "UZS",
+              "VEF",
+              "VND",
+              "VUV",
+              "WST",
+              "XAF",
+              "XCD",
+              "XDR",
+              "XOF",
+              "XPF",
+              "XTS",
+              "XXX",
+              "YER",
+              "ZAR",
+              "ZMW",
+              "ZWD"
+            ]
           },
           {
             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -309,9 +810,176 @@
   "ActiveOrHistoricCurrencyCode": {
     "title": "ActiveOrHistoricCurrencyCode",
     "type": "string",
-    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-    "pattern": "^[A-Z]{3,3}$",
-    "example": "USD"
+    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+    "example": "USD",
+    "minLength": 3,
+    "maxLength": 3,
+    "enum": [
+      "AED",
+      "AFN",
+      "ALL",
+      "AMD",
+      "ANG",
+      "AOA",
+      "ARS",
+      "AUD",
+      "AWG",
+      "AZN",
+      "BAM",
+      "BBD",
+      "BDT",
+      "BGN",
+      "BHD",
+      "BIF",
+      "BMD",
+      "BND",
+      "BOB",
+      "BRL",
+      "BSD",
+      "BTN",
+      "BWP",
+      "BYN",
+      "BZD",
+      "CAD",
+      "CDF",
+      "CHF",
+      "CLP",
+      "CNY",
+      "COP",
+      "CRC",
+      "CUC",
+      "CUP",
+      "CVE",
+      "CZK",
+      "DJF",
+      "DKK",
+      "DOP",
+      "DZD",
+      "EGP",
+      "ERN",
+      "ETB",
+      "EUR",
+      "FJD",
+      "FKP",
+      "GBP",
+      "GEL",
+      "GGP",
+      "GHS",
+      "GIP",
+      "GMD",
+      "GNF",
+      "GTQ",
+      "GYD",
+      "HKD",
+      "HNL",
+      "HRK",
+      "HTG",
+      "HUF",
+      "IDR",
+      "ILS",
+      "IMP",
+      "INR",
+      "IQD",
+      "IRR",
+      "ISK",
+      "JEP",
+      "JMD",
+      "JOD",
+      "JPY",
+      "KES",
+      "KGS",
+      "KHR",
+      "KMF",
+      "KPW",
+      "KRW",
+      "KWD",
+      "KYD",
+      "KZT",
+      "LAK",
+      "LBP",
+      "LKR",
+      "LRD",
+      "LSL",
+      "LYD",
+      "MAD",
+      "MDL",
+      "MGA",
+      "MKD",
+      "MMK",
+      "MNT",
+      "MOP",
+      "MRO",
+      "MUR",
+      "MVR",
+      "MWK",
+      "MXN",
+      "MYR",
+      "MZN",
+      "NAD",
+      "NGN",
+      "NIO",
+      "NOK",
+      "NPR",
+      "NZD",
+      "OMR",
+      "PAB",
+      "PEN",
+      "PGK",
+      "PHP",
+      "PKR",
+      "PLN",
+      "PYG",
+      "QAR",
+      "RON",
+      "RSD",
+      "RUB",
+      "RWF",
+      "SAR",
+      "SBD",
+      "SCR",
+      "SDG",
+      "SEK",
+      "SGD",
+      "SHP",
+      "SLL",
+      "SOS",
+      "SPL",
+      "SRD",
+      "STD",
+      "SVC",
+      "SYP",
+      "SZL",
+      "THB",
+      "TJS",
+      "TMT",
+      "TND",
+      "TOP",
+      "TRY",
+      "TTD",
+      "TVD",
+      "TWD",
+      "TZS",
+      "UAH",
+      "UGX",
+      "USD",
+      "UYU",
+      "UZS",
+      "VEF",
+      "VND",
+      "VUV",
+      "WST",
+      "XAF",
+      "XCD",
+      "XDR",
+      "XOF",
+      "XPF",
+      "XTS",
+      "XXX",
+      "YER",
+      "ZAR",
+      "ZMW",
+      "ZWD"
+    ]
   },
   "AddressType2Code": {
     "description": "AddressType2Code\nSpecifies the type of address.\nADDR Address\nPBOX PostBox\nHOME Home\nBIZZ Business\nMLTO MailingTo\nDLVY Delivery\n",
@@ -437,6 +1105,16 @@
       "Cd": "ADDR"
     }
   },
+  "AmountTypeEnum": {
+    "title": "AmountTypeEnum",
+    "description": "NOTE: This pattern is not the original ISO20022 specification.\n      This represents the enum values when mapping to and from FSPIOP specification.\n",
+    "type": "string",
+    "enum": [
+      "SEND",
+      "RECEIVE"
+    ],
+    "example": "SEND"
+  },
   "AnyBICDec2014Identifier": {
     "title": "AnyBICDec2014Identifier",
     "type": "string",
@@ -3235,9 +3913,176 @@
           {
             "title": "ActiveOrHistoricCurrencyCode",
             "type": "string",
-            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-            "pattern": "^[A-Z]{3,3}$",
-            "example": "USD"
+            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+            "example": "USD",
+            "minLength": 3,
+            "maxLength": 3,
+            "enum": [
+              "AED",
+              "AFN",
+              "ALL",
+              "AMD",
+              "ANG",
+              "AOA",
+              "ARS",
+              "AUD",
+              "AWG",
+              "AZN",
+              "BAM",
+              "BBD",
+              "BDT",
+              "BGN",
+              "BHD",
+              "BIF",
+              "BMD",
+              "BND",
+              "BOB",
+              "BRL",
+              "BSD",
+              "BTN",
+              "BWP",
+              "BYN",
+              "BZD",
+              "CAD",
+              "CDF",
+              "CHF",
+              "CLP",
+              "CNY",
+              "COP",
+              "CRC",
+              "CUC",
+              "CUP",
+              "CVE",
+              "CZK",
+              "DJF",
+              "DKK",
+              "DOP",
+              "DZD",
+              "EGP",
+              "ERN",
+              "ETB",
+              "EUR",
+              "FJD",
+              "FKP",
+              "GBP",
+              "GEL",
+              "GGP",
+              "GHS",
+              "GIP",
+              "GMD",
+              "GNF",
+              "GTQ",
+              "GYD",
+              "HKD",
+              "HNL",
+              "HRK",
+              "HTG",
+              "HUF",
+              "IDR",
+              "ILS",
+              "IMP",
+              "INR",
+              "IQD",
+              "IRR",
+              "ISK",
+              "JEP",
+              "JMD",
+              "JOD",
+              "JPY",
+              "KES",
+              "KGS",
+              "KHR",
+              "KMF",
+              "KPW",
+              "KRW",
+              "KWD",
+              "KYD",
+              "KZT",
+              "LAK",
+              "LBP",
+              "LKR",
+              "LRD",
+              "LSL",
+              "LYD",
+              "MAD",
+              "MDL",
+              "MGA",
+              "MKD",
+              "MMK",
+              "MNT",
+              "MOP",
+              "MRO",
+              "MUR",
+              "MVR",
+              "MWK",
+              "MXN",
+              "MYR",
+              "MZN",
+              "NAD",
+              "NGN",
+              "NIO",
+              "NOK",
+              "NPR",
+              "NZD",
+              "OMR",
+              "PAB",
+              "PEN",
+              "PGK",
+              "PHP",
+              "PKR",
+              "PLN",
+              "PYG",
+              "QAR",
+              "RON",
+              "RSD",
+              "RUB",
+              "RWF",
+              "SAR",
+              "SBD",
+              "SCR",
+              "SDG",
+              "SEK",
+              "SGD",
+              "SHP",
+              "SLL",
+              "SOS",
+              "SPL",
+              "SRD",
+              "STD",
+              "SVC",
+              "SYP",
+              "SZL",
+              "THB",
+              "TJS",
+              "TMT",
+              "TND",
+              "TOP",
+              "TRY",
+              "TTD",
+              "TVD",
+              "TWD",
+              "TZS",
+              "UAH",
+              "UGX",
+              "USD",
+              "UYU",
+              "UZS",
+              "VEF",
+              "VND",
+              "VUV",
+              "WST",
+              "XAF",
+              "XCD",
+              "XDR",
+              "XOF",
+              "XPF",
+              "XTS",
+              "XXX",
+              "YER",
+              "ZAR",
+              "ZMW",
+              "ZWD"
+            ]
           },
           {
             "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -3611,9 +4456,176 @@
                   {
                     "title": "ActiveOrHistoricCurrencyCode",
                     "type": "string",
-                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                    "pattern": "^[A-Z]{3,3}$",
-                    "example": "USD"
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
                   },
                   {
                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -5370,45 +6382,39 @@
               "InstrId": {
                 "allOf": [
                   {
-                    "title": "Max35Text",
-                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                    "title": "ULIDIdentifier",
                     "type": "string",
-                    "minLength": 1,
-                    "maxLength": 35,
-                    "example": 1.234567890123457e+34
+                    "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                    "example": "01AN4Z07BY79KA1307SR9X4MV3"
                   },
                   {
-                    "description": "InstructionIdentification (FSPIOP equivalent: transactionRequestId)\n\nDefinition: Unique identification, as assigned by an instructing party for an instructed party, to\nunambiguously identify the instruction.\n\nUsage: The instruction identification is a point to point reference that can be used between the\ninstructing party and the instructed party to refer to the individual instruction. It can be included in\nseveral messages related to the instruction.\n"
+                    "description": "InstructionIdentification (FSPIOP equivalent: transactionRequestId)\n\nDefinition: Unique identification, as assigned by an instructing party for an instructed party, to\nunambiguously identify the instruction.\n\nUsage: The instruction identification is a point to point reference that can be used between the\ninstructing party and the instructed party to refer to the individual instruction. It can be included in\nseveral messages related to the instruction.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                   }
                 ]
               },
               "EndToEndId": {
                 "allOf": [
                   {
-                    "title": "Max35Text",
-                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                    "title": "ULIDIdentifier",
                     "type": "string",
-                    "minLength": 1,
-                    "maxLength": 35,
-                    "example": 1.234567890123457e+34
+                    "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                    "example": "01AN4Z07BY79KA1307SR9X4MV3"
                   },
                   {
-                    "description": "EndToEndIdentification (FSPIOP equivalent: transactionId)\n\nDefinition: Unique identification, as assigned by the initiating party, to unambiguously identify the\ntransaction. This identification is passed on, unchanged, throughout the entire end-to-end chain.\n\nUsage: The end-to-end identification can be used for reconciliation or to link tasks relating to the\ntransaction. It can be included in several messages related to the transaction.\n\nUsage: In case there are technical limitations to pass on multiple references, the end-to-end\nidentification must be passed on throughout the entire end-to-end chain.\n"
+                    "description": "EndToEndIdentification (FSPIOP equivalent: transactionId)\n\nDefinition: Unique identification, as assigned by the initiating party, to unambiguously identify the\ntransaction. This identification is passed on, unchanged, throughout the entire end-to-end chain.\n\nUsage: The end-to-end identification can be used for reconciliation or to link tasks relating to the\ntransaction. It can be included in several messages related to the transaction.\n\nUsage: In case there are technical limitations to pass on multiple references, the end-to-end\nidentification must be passed on throughout the entire end-to-end chain.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                   }
                 ]
               },
               "TxId": {
                 "allOf": [
                   {
-                    "title": "Max35Text",
-                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                    "title": "ULIDIdentifier",
                     "type": "string",
-                    "minLength": 1,
-                    "maxLength": 35,
-                    "example": 1.234567890123457e+34
+                    "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                    "example": "01AN4Z07BY79KA1307SR9X4MV3"
                   },
                   {
-                    "description": "TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)\n\nDefinition: Unique identification, as assigned by the first instructing agent, to unambiguously identify the\ntransaction that is passed on, unchanged, throughout the entire interbank chain.\n\nUsage: The transaction identification can be used for reconciliation, tracking or to link tasks relating to\nthe transaction on the interbank level.\n\nUsage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.\n"
+                    "description": "TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)\n\nDefinition: Unique identification, as assigned by the first instructing agent, to unambiguously identify the\ntransaction that is passed on, unchanged, throughout the entire interbank chain.\n\nUsage: The transaction identification can be used for reconciliation, tracking or to link tasks relating to\nthe transaction on the interbank level.\n\nUsage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                   }
                 ]
               },
@@ -5719,9 +6725,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -9774,9 +10947,176 @@
                   {
                     "title": "ActiveCurrencyCode",
                     "type": "string",
-                    "pattern": "^[A-Z]{3,3}$",
-                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".",
-                    "example": "USD"
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
                   },
                   {
                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -9823,9 +11163,176 @@
                   {
                     "title": "ActiveOrHistoricCurrencyCode",
                     "type": "string",
-                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                    "pattern": "^[A-Z]{3,3}$",
-                    "example": "USD"
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
                   },
                   {
                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -9904,9 +11411,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -12284,9 +13958,176 @@
                   {
                     "title": "ActiveOrHistoricCurrencyCode",
                     "type": "string",
-                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                    "pattern": "^[A-Z]{3,3}$",
-                    "example": "USD"
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
                   },
                   {
                     "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -15609,9 +17450,176 @@
                   {
                     "title": "ActiveOrHistoricCurrencyCode",
                     "type": "string",
-                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                    "pattern": "^[A-Z]{3,3}$",
-                    "example": "USD"
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
                   },
                   {
                     "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -16074,9 +18082,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -16224,9 +18399,176 @@
                                     {
                                       "title": "ActiveOrHistoricCurrencyCode",
                                       "type": "string",
-                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                      "pattern": "^[A-Z]{3,3}$",
-                                      "example": "USD"
+                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                      "example": "USD",
+                                      "minLength": 3,
+                                      "maxLength": 3,
+                                      "enum": [
+                                        "AED",
+                                        "AFN",
+                                        "ALL",
+                                        "AMD",
+                                        "ANG",
+                                        "AOA",
+                                        "ARS",
+                                        "AUD",
+                                        "AWG",
+                                        "AZN",
+                                        "BAM",
+                                        "BBD",
+                                        "BDT",
+                                        "BGN",
+                                        "BHD",
+                                        "BIF",
+                                        "BMD",
+                                        "BND",
+                                        "BOB",
+                                        "BRL",
+                                        "BSD",
+                                        "BTN",
+                                        "BWP",
+                                        "BYN",
+                                        "BZD",
+                                        "CAD",
+                                        "CDF",
+                                        "CHF",
+                                        "CLP",
+                                        "CNY",
+                                        "COP",
+                                        "CRC",
+                                        "CUC",
+                                        "CUP",
+                                        "CVE",
+                                        "CZK",
+                                        "DJF",
+                                        "DKK",
+                                        "DOP",
+                                        "DZD",
+                                        "EGP",
+                                        "ERN",
+                                        "ETB",
+                                        "EUR",
+                                        "FJD",
+                                        "FKP",
+                                        "GBP",
+                                        "GEL",
+                                        "GGP",
+                                        "GHS",
+                                        "GIP",
+                                        "GMD",
+                                        "GNF",
+                                        "GTQ",
+                                        "GYD",
+                                        "HKD",
+                                        "HNL",
+                                        "HRK",
+                                        "HTG",
+                                        "HUF",
+                                        "IDR",
+                                        "ILS",
+                                        "IMP",
+                                        "INR",
+                                        "IQD",
+                                        "IRR",
+                                        "ISK",
+                                        "JEP",
+                                        "JMD",
+                                        "JOD",
+                                        "JPY",
+                                        "KES",
+                                        "KGS",
+                                        "KHR",
+                                        "KMF",
+                                        "KPW",
+                                        "KRW",
+                                        "KWD",
+                                        "KYD",
+                                        "KZT",
+                                        "LAK",
+                                        "LBP",
+                                        "LKR",
+                                        "LRD",
+                                        "LSL",
+                                        "LYD",
+                                        "MAD",
+                                        "MDL",
+                                        "MGA",
+                                        "MKD",
+                                        "MMK",
+                                        "MNT",
+                                        "MOP",
+                                        "MRO",
+                                        "MUR",
+                                        "MVR",
+                                        "MWK",
+                                        "MXN",
+                                        "MYR",
+                                        "MZN",
+                                        "NAD",
+                                        "NGN",
+                                        "NIO",
+                                        "NOK",
+                                        "NPR",
+                                        "NZD",
+                                        "OMR",
+                                        "PAB",
+                                        "PEN",
+                                        "PGK",
+                                        "PHP",
+                                        "PKR",
+                                        "PLN",
+                                        "PYG",
+                                        "QAR",
+                                        "RON",
+                                        "RSD",
+                                        "RUB",
+                                        "RWF",
+                                        "SAR",
+                                        "SBD",
+                                        "SCR",
+                                        "SDG",
+                                        "SEK",
+                                        "SGD",
+                                        "SHP",
+                                        "SLL",
+                                        "SOS",
+                                        "SPL",
+                                        "SRD",
+                                        "STD",
+                                        "SVC",
+                                        "SYP",
+                                        "SZL",
+                                        "THB",
+                                        "TJS",
+                                        "TMT",
+                                        "TND",
+                                        "TOP",
+                                        "TRY",
+                                        "TTD",
+                                        "TVD",
+                                        "TWD",
+                                        "TZS",
+                                        "UAH",
+                                        "UGX",
+                                        "USD",
+                                        "UYU",
+                                        "UZS",
+                                        "VEF",
+                                        "VND",
+                                        "VUV",
+                                        "WST",
+                                        "XAF",
+                                        "XCD",
+                                        "XDR",
+                                        "XOF",
+                                        "XPF",
+                                        "XTS",
+                                        "XXX",
+                                        "YER",
+                                        "ZAR",
+                                        "ZMW",
+                                        "ZWD"
+                                      ]
                                     },
                                     {
                                       "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -16680,9 +19022,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -16729,9 +19238,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -17042,9 +19718,176 @@
                                           {
                                             "title": "ActiveOrHistoricCurrencyCode",
                                             "type": "string",
-                                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                            "pattern": "^[A-Z]{3,3}$",
-                                            "example": "USD"
+                                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                            "example": "USD",
+                                            "minLength": 3,
+                                            "maxLength": 3,
+                                            "enum": [
+                                              "AED",
+                                              "AFN",
+                                              "ALL",
+                                              "AMD",
+                                              "ANG",
+                                              "AOA",
+                                              "ARS",
+                                              "AUD",
+                                              "AWG",
+                                              "AZN",
+                                              "BAM",
+                                              "BBD",
+                                              "BDT",
+                                              "BGN",
+                                              "BHD",
+                                              "BIF",
+                                              "BMD",
+                                              "BND",
+                                              "BOB",
+                                              "BRL",
+                                              "BSD",
+                                              "BTN",
+                                              "BWP",
+                                              "BYN",
+                                              "BZD",
+                                              "CAD",
+                                              "CDF",
+                                              "CHF",
+                                              "CLP",
+                                              "CNY",
+                                              "COP",
+                                              "CRC",
+                                              "CUC",
+                                              "CUP",
+                                              "CVE",
+                                              "CZK",
+                                              "DJF",
+                                              "DKK",
+                                              "DOP",
+                                              "DZD",
+                                              "EGP",
+                                              "ERN",
+                                              "ETB",
+                                              "EUR",
+                                              "FJD",
+                                              "FKP",
+                                              "GBP",
+                                              "GEL",
+                                              "GGP",
+                                              "GHS",
+                                              "GIP",
+                                              "GMD",
+                                              "GNF",
+                                              "GTQ",
+                                              "GYD",
+                                              "HKD",
+                                              "HNL",
+                                              "HRK",
+                                              "HTG",
+                                              "HUF",
+                                              "IDR",
+                                              "ILS",
+                                              "IMP",
+                                              "INR",
+                                              "IQD",
+                                              "IRR",
+                                              "ISK",
+                                              "JEP",
+                                              "JMD",
+                                              "JOD",
+                                              "JPY",
+                                              "KES",
+                                              "KGS",
+                                              "KHR",
+                                              "KMF",
+                                              "KPW",
+                                              "KRW",
+                                              "KWD",
+                                              "KYD",
+                                              "KZT",
+                                              "LAK",
+                                              "LBP",
+                                              "LKR",
+                                              "LRD",
+                                              "LSL",
+                                              "LYD",
+                                              "MAD",
+                                              "MDL",
+                                              "MGA",
+                                              "MKD",
+                                              "MMK",
+                                              "MNT",
+                                              "MOP",
+                                              "MRO",
+                                              "MUR",
+                                              "MVR",
+                                              "MWK",
+                                              "MXN",
+                                              "MYR",
+                                              "MZN",
+                                              "NAD",
+                                              "NGN",
+                                              "NIO",
+                                              "NOK",
+                                              "NPR",
+                                              "NZD",
+                                              "OMR",
+                                              "PAB",
+                                              "PEN",
+                                              "PGK",
+                                              "PHP",
+                                              "PKR",
+                                              "PLN",
+                                              "PYG",
+                                              "QAR",
+                                              "RON",
+                                              "RSD",
+                                              "RUB",
+                                              "RWF",
+                                              "SAR",
+                                              "SBD",
+                                              "SCR",
+                                              "SDG",
+                                              "SEK",
+                                              "SGD",
+                                              "SHP",
+                                              "SLL",
+                                              "SOS",
+                                              "SPL",
+                                              "SRD",
+                                              "STD",
+                                              "SVC",
+                                              "SYP",
+                                              "SZL",
+                                              "THB",
+                                              "TJS",
+                                              "TMT",
+                                              "TND",
+                                              "TOP",
+                                              "TRY",
+                                              "TTD",
+                                              "TVD",
+                                              "TWD",
+                                              "TZS",
+                                              "UAH",
+                                              "UGX",
+                                              "USD",
+                                              "UYU",
+                                              "UZS",
+                                              "VEF",
+                                              "VND",
+                                              "VUV",
+                                              "WST",
+                                              "XAF",
+                                              "XCD",
+                                              "XDR",
+                                              "XOF",
+                                              "XPF",
+                                              "XTS",
+                                              "XXX",
+                                              "YER",
+                                              "ZAR",
+                                              "ZMW",
+                                              "ZWD"
+                                            ]
                                           },
                                           {
                                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -17091,9 +19934,176 @@
                                           {
                                             "title": "ActiveOrHistoricCurrencyCode",
                                             "type": "string",
-                                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                            "pattern": "^[A-Z]{3,3}$",
-                                            "example": "USD"
+                                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                            "example": "USD",
+                                            "minLength": 3,
+                                            "maxLength": 3,
+                                            "enum": [
+                                              "AED",
+                                              "AFN",
+                                              "ALL",
+                                              "AMD",
+                                              "ANG",
+                                              "AOA",
+                                              "ARS",
+                                              "AUD",
+                                              "AWG",
+                                              "AZN",
+                                              "BAM",
+                                              "BBD",
+                                              "BDT",
+                                              "BGN",
+                                              "BHD",
+                                              "BIF",
+                                              "BMD",
+                                              "BND",
+                                              "BOB",
+                                              "BRL",
+                                              "BSD",
+                                              "BTN",
+                                              "BWP",
+                                              "BYN",
+                                              "BZD",
+                                              "CAD",
+                                              "CDF",
+                                              "CHF",
+                                              "CLP",
+                                              "CNY",
+                                              "COP",
+                                              "CRC",
+                                              "CUC",
+                                              "CUP",
+                                              "CVE",
+                                              "CZK",
+                                              "DJF",
+                                              "DKK",
+                                              "DOP",
+                                              "DZD",
+                                              "EGP",
+                                              "ERN",
+                                              "ETB",
+                                              "EUR",
+                                              "FJD",
+                                              "FKP",
+                                              "GBP",
+                                              "GEL",
+                                              "GGP",
+                                              "GHS",
+                                              "GIP",
+                                              "GMD",
+                                              "GNF",
+                                              "GTQ",
+                                              "GYD",
+                                              "HKD",
+                                              "HNL",
+                                              "HRK",
+                                              "HTG",
+                                              "HUF",
+                                              "IDR",
+                                              "ILS",
+                                              "IMP",
+                                              "INR",
+                                              "IQD",
+                                              "IRR",
+                                              "ISK",
+                                              "JEP",
+                                              "JMD",
+                                              "JOD",
+                                              "JPY",
+                                              "KES",
+                                              "KGS",
+                                              "KHR",
+                                              "KMF",
+                                              "KPW",
+                                              "KRW",
+                                              "KWD",
+                                              "KYD",
+                                              "KZT",
+                                              "LAK",
+                                              "LBP",
+                                              "LKR",
+                                              "LRD",
+                                              "LSL",
+                                              "LYD",
+                                              "MAD",
+                                              "MDL",
+                                              "MGA",
+                                              "MKD",
+                                              "MMK",
+                                              "MNT",
+                                              "MOP",
+                                              "MRO",
+                                              "MUR",
+                                              "MVR",
+                                              "MWK",
+                                              "MXN",
+                                              "MYR",
+                                              "MZN",
+                                              "NAD",
+                                              "NGN",
+                                              "NIO",
+                                              "NOK",
+                                              "NPR",
+                                              "NZD",
+                                              "OMR",
+                                              "PAB",
+                                              "PEN",
+                                              "PGK",
+                                              "PHP",
+                                              "PKR",
+                                              "PLN",
+                                              "PYG",
+                                              "QAR",
+                                              "RON",
+                                              "RSD",
+                                              "RUB",
+                                              "RWF",
+                                              "SAR",
+                                              "SBD",
+                                              "SCR",
+                                              "SDG",
+                                              "SEK",
+                                              "SGD",
+                                              "SHP",
+                                              "SLL",
+                                              "SOS",
+                                              "SPL",
+                                              "SRD",
+                                              "STD",
+                                              "SVC",
+                                              "SYP",
+                                              "SZL",
+                                              "THB",
+                                              "TJS",
+                                              "TMT",
+                                              "TND",
+                                              "TOP",
+                                              "TRY",
+                                              "TTD",
+                                              "TVD",
+                                              "TWD",
+                                              "TZS",
+                                              "UAH",
+                                              "UGX",
+                                              "USD",
+                                              "UYU",
+                                              "UZS",
+                                              "VEF",
+                                              "VND",
+                                              "VUV",
+                                              "WST",
+                                              "XAF",
+                                              "XCD",
+                                              "XDR",
+                                              "XOF",
+                                              "XPF",
+                                              "XTS",
+                                              "XXX",
+                                              "YER",
+                                              "ZAR",
+                                              "ZMW",
+                                              "ZWD"
+                                            ]
                                           },
                                           {
                                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -17267,9 +20277,176 @@
                                                   {
                                                     "title": "ActiveOrHistoricCurrencyCode",
                                                     "type": "string",
-                                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                    "pattern": "^[A-Z]{3,3}$",
-                                                    "example": "USD"
+                                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                    "example": "USD",
+                                                    "minLength": 3,
+                                                    "maxLength": 3,
+                                                    "enum": [
+                                                      "AED",
+                                                      "AFN",
+                                                      "ALL",
+                                                      "AMD",
+                                                      "ANG",
+                                                      "AOA",
+                                                      "ARS",
+                                                      "AUD",
+                                                      "AWG",
+                                                      "AZN",
+                                                      "BAM",
+                                                      "BBD",
+                                                      "BDT",
+                                                      "BGN",
+                                                      "BHD",
+                                                      "BIF",
+                                                      "BMD",
+                                                      "BND",
+                                                      "BOB",
+                                                      "BRL",
+                                                      "BSD",
+                                                      "BTN",
+                                                      "BWP",
+                                                      "BYN",
+                                                      "BZD",
+                                                      "CAD",
+                                                      "CDF",
+                                                      "CHF",
+                                                      "CLP",
+                                                      "CNY",
+                                                      "COP",
+                                                      "CRC",
+                                                      "CUC",
+                                                      "CUP",
+                                                      "CVE",
+                                                      "CZK",
+                                                      "DJF",
+                                                      "DKK",
+                                                      "DOP",
+                                                      "DZD",
+                                                      "EGP",
+                                                      "ERN",
+                                                      "ETB",
+                                                      "EUR",
+                                                      "FJD",
+                                                      "FKP",
+                                                      "GBP",
+                                                      "GEL",
+                                                      "GGP",
+                                                      "GHS",
+                                                      "GIP",
+                                                      "GMD",
+                                                      "GNF",
+                                                      "GTQ",
+                                                      "GYD",
+                                                      "HKD",
+                                                      "HNL",
+                                                      "HRK",
+                                                      "HTG",
+                                                      "HUF",
+                                                      "IDR",
+                                                      "ILS",
+                                                      "IMP",
+                                                      "INR",
+                                                      "IQD",
+                                                      "IRR",
+                                                      "ISK",
+                                                      "JEP",
+                                                      "JMD",
+                                                      "JOD",
+                                                      "JPY",
+                                                      "KES",
+                                                      "KGS",
+                                                      "KHR",
+                                                      "KMF",
+                                                      "KPW",
+                                                      "KRW",
+                                                      "KWD",
+                                                      "KYD",
+                                                      "KZT",
+                                                      "LAK",
+                                                      "LBP",
+                                                      "LKR",
+                                                      "LRD",
+                                                      "LSL",
+                                                      "LYD",
+                                                      "MAD",
+                                                      "MDL",
+                                                      "MGA",
+                                                      "MKD",
+                                                      "MMK",
+                                                      "MNT",
+                                                      "MOP",
+                                                      "MRO",
+                                                      "MUR",
+                                                      "MVR",
+                                                      "MWK",
+                                                      "MXN",
+                                                      "MYR",
+                                                      "MZN",
+                                                      "NAD",
+                                                      "NGN",
+                                                      "NIO",
+                                                      "NOK",
+                                                      "NPR",
+                                                      "NZD",
+                                                      "OMR",
+                                                      "PAB",
+                                                      "PEN",
+                                                      "PGK",
+                                                      "PHP",
+                                                      "PKR",
+                                                      "PLN",
+                                                      "PYG",
+                                                      "QAR",
+                                                      "RON",
+                                                      "RSD",
+                                                      "RUB",
+                                                      "RWF",
+                                                      "SAR",
+                                                      "SBD",
+                                                      "SCR",
+                                                      "SDG",
+                                                      "SEK",
+                                                      "SGD",
+                                                      "SHP",
+                                                      "SLL",
+                                                      "SOS",
+                                                      "SPL",
+                                                      "SRD",
+                                                      "STD",
+                                                      "SVC",
+                                                      "SYP",
+                                                      "SZL",
+                                                      "THB",
+                                                      "TJS",
+                                                      "TMT",
+                                                      "TND",
+                                                      "TOP",
+                                                      "TRY",
+                                                      "TTD",
+                                                      "TVD",
+                                                      "TWD",
+                                                      "TZS",
+                                                      "UAH",
+                                                      "UGX",
+                                                      "USD",
+                                                      "UYU",
+                                                      "UZS",
+                                                      "VEF",
+                                                      "VND",
+                                                      "VUV",
+                                                      "WST",
+                                                      "XAF",
+                                                      "XCD",
+                                                      "XDR",
+                                                      "XOF",
+                                                      "XPF",
+                                                      "XTS",
+                                                      "XXX",
+                                                      "YER",
+                                                      "ZAR",
+                                                      "ZMW",
+                                                      "ZWD"
+                                                    ]
                                                   },
                                                   {
                                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -17460,614 +20637,1282 @@
                                                     {
                                                       "title": "ActiveOrHistoricCurrencyCode",
                                                       "type": "string",
-                                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                      "pattern": "^[A-Z]{3,3}$",
-                                                      "example": "USD"
-                                                    },
-                                                    {
-                                                      "description": "Currency\nIdentification of the currency in which the account is held.\n"
-                                                    }
-                                                  ]
-                                                }
-                                              },
-                                              "required": [
-                                                "ActiveOrHistoricCurrencyAndAmount",
-                                                "Ccy"
-                                              ],
-                                              "example": {
-                                                "ActiveOrHistoricCurrencyAndAmount": 123.45,
-                                                "Ccy": "USD"
-                                              }
-                                            },
-                                            {
-                                              "description": "Amount\n\nUnderlying tax amount related to the specified period.\n"
-                                            }
-                                          ]
-                                        }
-                                      },
-                                      "required": [
-                                        "Amt"
-                                      ],
-                                      "example": {
-                                        "Prd": {
-                                          "Yr": 2020,
-                                          "Tp": "MM01",
-                                          "FrToDt": {
-                                            "FrDt": "2020-01-01",
-                                            "ToDt": "2020-01-31"
-                                          }
-                                        },
-                                        "Amt": {
-                                          "Amt": 100,
-                                          "Ccy": "EUR"
-                                        }
-                                      }
-                                    },
-                                    "type": "array"
-                                  }
-                                ]
-                              }
-                            },
-                            "example": {
-                              "Rate": 0,
-                              "TaxblBaseAmt": {
-                                "Ccy": "EUR",
-                                "Amt": 0
-                              },
-                              "TtlAmt": {
-                                "Ccy": "EUR",
-                                "Amt": 0
-                              },
-                              "Dtls": {
-                                "Tp": "T1",
-                                "Ctry": "CH",
-                                "Cd": "CHF",
-                                "Amt": {
-                                  "Ccy": "CHF",
-                                  "Amt": 1000
-                                },
-                                "Inf": 12345
-                              }
-                            }
-                          },
-                          {
-                            "description": "TaxAmount\n\nSet of elements used to provide information on the amount of the tax record.\n"
-                          }
-                        ]
-                      },
-                      "Tp": {
-                        "allOf": [
-                          {
-                            "title": "Max35Text",
-                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
-                            "type": "string",
-                            "minLength": 1,
-                            "maxLength": 35,
-                            "example": 1.234567890123457e+34
-                          },
-                          {
-                            "description": "Type\n\nHigh level code to identify the type of tax details.\n"
-                          }
-                        ]
-                      }
-                    },
-                    "example": {
-                      "Tp": "VAT",
-                      "Ctgy": "A",
-                      "CtgyDtls": "Standard",
-                      "DbtrSts": "Resident",
-                      "CertId": 123456789,
-                      "FrmsCd": 123456789,
-                      "Prd": {
-                        "Yr": 2019,
-                        "Tp": "MM01",
-                        "FrToDt": {
-                          "FrDt": "2019-01-01",
-                          "ToDt": "2019-12-31"
-                        }
-                      },
-                      "TaxAmt": {
-                        "Rate": 0.2,
-                        "TaxblBaseAmt": {
-                          "Ccy": "EUR",
-                          "Amt": 1000
-                        },
-                        "TtlAmt": {
-                          "Ccy": "EUR",
-                          "Amt": 200
-                        }
-                      },
-                      "AddtlInf": "VAT applicable"
-                    }
-                  },
-                  {
-                    "items": {
-                      "title": "TaxRecord3",
-                      "description": "Set of elements used to define the tax record.\n",
-                      "type": "object",
-                      "properties": {
-                        "AddtlInf": {
-                          "allOf": [
-                            {
-                              "title": "Max140Text",
-                              "description": "Specifies a character string with a maximum length of 140 characters.\n",
-                              "type": "string",
-                              "minLength": 1,
-                              "maxLength": 140,
-                              "example": 12345
-                            },
-                            {
-                              "description": "AdditionalInformation\n\nFurther details of the tax record.\n"
-                            }
-                          ]
-                        },
-                        "CertId": {
-                          "allOf": [
-                            {
-                              "title": "Max35Text",
-                              "description": "Specifies a character string with a maximum length of 35 characters.\n",
-                              "type": "string",
-                              "minLength": 1,
-                              "maxLength": 35,
-                              "example": 1.234567890123457e+34
-                            },
-                            {
-                              "description": "CertificateIdentification\n\nIdentification number of the tax report as assigned by the taxing authority.\n"
-                            }
-                          ]
-                        },
-                        "Ctgy": {
-                          "allOf": [
-                            {
-                              "title": "Max35Text",
-                              "description": "Specifies a character string with a maximum length of 35 characters.\n",
-                              "type": "string",
-                              "minLength": 1,
-                              "maxLength": 35,
-                              "example": 1.234567890123457e+34
-                            },
-                            {
-                              "description": "Category\n\nSpecifies the tax code as published by the tax authority.\n"
-                            }
-                          ]
-                        },
-                        "CtgyDtls": {
-                          "allOf": [
-                            {
-                              "title": "Max35Text",
-                              "description": "Specifies a character string with a maximum length of 35 characters.\n",
-                              "type": "string",
-                              "minLength": 1,
-                              "maxLength": 35,
-                              "example": 1.234567890123457e+34
-                            },
-                            {
-                              "description": "CategoryDetails\n\nProvides further details of the category tax code.\n"
-                            }
-                          ]
-                        },
-                        "DbtrSts": {
-                          "allOf": [
-                            {
-                              "title": "Max35Text",
-                              "description": "Specifies a character string with a maximum length of 35 characters.\n",
-                              "type": "string",
-                              "minLength": 1,
-                              "maxLength": 35,
-                              "example": 1.234567890123457e+34
-                            },
-                            {
-                              "description": "DebtorStatus\n\nCode provided by local authority to identify the status of the party that has drawn up the settlement document.\n"
-                            }
-                          ]
-                        },
-                        "FrmsCd": {
-                          "allOf": [
-                            {
-                              "title": "Max35Text",
-                              "description": "Specifies a character string with a maximum length of 35 characters.\n",
-                              "type": "string",
-                              "minLength": 1,
-                              "maxLength": 35,
-                              "example": 1.234567890123457e+34
-                            },
-                            {
-                              "description": "FormsCode\n\nIdentifies, in a coded form, on which template the tax report is to be provided.\n"
-                            }
-                          ]
-                        },
-                        "Prd": {
-                          "allOf": [
-                            {
-                              "title": "TaxPeriod3",
-                              "description": "Period of time details related to the tax payment.\n",
-                              "type": "object",
-                              "properties": {
-                                "FrToDt": {
-                                  "allOf": [
-                                    {
-                                      "title": "DatePeriod2",
-                                      "description": "Range of time defined by a start date and an end date.\n",
-                                      "type": "object",
-                                      "properties": {
-                                        "FrDt": {
-                                          "allOf": [
-                                            {
-                                              "title": "ISODate",
-                                              "description": "A particular point in the progression of time in a calendar year expressed in the YYYY-MM-DD format. This representation is defined in \"XML Schema Part 2: Datatypes Second Edition - W3C Recommendation 28 October 2004\" which is aligned with ISO 8601.\n",
-                                              "type": "string",
-                                              "format": "date",
-                                              "example": "2013-03-07"
-                                            },
-                                            {
-                                              "description": "FromDate\nStart date of the range.\n"
-                                            }
-                                          ]
-                                        },
-                                        "ToDt": {
-                                          "allOf": [
-                                            {
-                                              "title": "ISODate",
-                                              "description": "A particular point in the progression of time in a calendar year expressed in the YYYY-MM-DD format. This representation is defined in \"XML Schema Part 2: Datatypes Second Edition - W3C Recommendation 28 October 2004\" which is aligned with ISO 8601.\n",
-                                              "type": "string",
-                                              "format": "date",
-                                              "example": "2013-03-07"
-                                            },
-                                            {
-                                              "description": "ToDate\nEnd date of the range.\n"
-                                            }
-                                          ]
-                                        }
-                                      },
-                                      "required": [
-                                        "FrDt",
-                                        "ToDt"
-                                      ],
-                                      "example": {
-                                        "FrDt": "2022-01-01",
-                                        "ToDt": "2022-12-31"
-                                      }
-                                    },
-                                    {
-                                      "description": "FromToDate\n\nRange of time between a start date and an end date for which the tax report is provided.\n"
-                                    }
-                                  ]
-                                },
-                                "Tp": {
-                                  "allOf": [
-                                    {
-                                      "title": "TaxRecordPeriod1Code",
-                                      "description": "Specifies the period related to the tax payment\n\nMM01 FirstMonth Tax is related to the second month of the period.\nMM02 SecondMonth Tax is related to the first month of the period.\nMM03 ThirdMonth Tax is related to the third month of the period.\nMM04 FourthMonth Tax is related to the fourth month of the period.\nMM05 FifthMonth Tax is related to the fifth month of the period.\nMM06 SixthMonth Tax is related to the sixth month of the period.\nMM07 SeventhMonth Tax is related to the seventh month of the period.\nMM08 EighthMonth Tax is related to the eighth month of the period.\nMM09 NinthMonth Tax is related to the ninth month of the period.\nMM10 TenthMonth Tax is related to the tenth month of the period.\nMM11 EleventhMonth Tax is related to the eleventh month of the period.\nMM12 TwelfthMonth Tax is related to the twelfth month of the period.\nQTR1 FirstQuarter Tax is related to the first quarter of the period.\nQTR2 SecondQuarter Tax is related to the second quarter of the period.\nQTR3 ThirdQuarter Tax is related to the third quarter of the period.\nQTR4 FourthQuarter Tax is related to the forth quarter of the period.\nHLF1 FirstHalf Tax is related to the first half of the period.\nHLF2 SecondHalf Tax is related to the second half of the period.\n",
-                                      "type": "string",
-                                      "enum": [
-                                        "MM01",
-                                        "MM02",
-                                        "MM03",
-                                        "MM04",
-                                        "MM05",
-                                        "MM06",
-                                        "MM07",
-                                        "MM08",
-                                        "MM09",
-                                        "MM10",
-                                        "MM11",
-                                        "MM12",
-                                        "QTR1",
-                                        "QTR2",
-                                        "QTR3",
-                                        "QTR4",
-                                        "HLF1",
-                                        "HLF2"
-                                      ],
-                                      "example": "HLF1"
-                                    },
-                                    {
-                                      "description": "Type\n\nIdentification of the period related to the tax payment.\n"
-                                    }
-                                  ]
-                                },
-                                "Yr": {
-                                  "allOf": [
-                                    {
-                                      "title": "ISOYear",
-                                      "description": "Year represented by YYYY (ISO 8601).\n",
-                                      "type": "string",
-                                      "pattern": "^\\d{4}(Z|([+-]\\d{2}:\\d{2})){0,1}$",
-                                      "example": 2019
-                                    },
-                                    {
-                                      "description": "Year\n\nYear related to the tax payment.\n"
-                                    }
-                                  ]
-                                }
-                              },
-                              "example": {
-                                "Yr": 2020,
-                                "Tp": "MM01",
-                                "FrToDt": {
-                                  "FrDt": "2020-01-01",
-                                  "ToDt": "2020-01-31"
-                                }
-                              }
-                            },
-                            {
-                              "description": "Period\n\nSet of elements used to provide details on the period of time related to the tax payment.\n"
-                            }
-                          ]
-                        },
-                        "TaxAmt": {
-                          "allOf": [
-                            {
-                              "title": "TaxAmount3",
-                              "description": "Information on the amount of the tax record.\n",
-                              "type": "object",
-                              "properties": {
-                                "Rate": {
-                                  "allOf": [
-                                    {
-                                      "title": "PercentageRate",
-                                      "type": "string",
-                                      "example": 1234,
-                                      "pattern": "^(?!0\\d)(\\d{1,11}|\\d{1,10}.\\d{1}|\\d{1,9}.\\d{1,2}|\\d{1,8}.\\d{1,3}|\\d{1,7}.\\d{1,4}|\\d{1,6}.\\d{1,5}|\\d{1,5}.\\d{1,6}|\\d{1,4}.\\d{1,7}|\\d{1,3}.\\d{1,8}|\\d{1,2}.\\d{1,9}|\\d{1}.\\d{1,10})$"
-                                    },
-                                    {
-                                      "description": "Rate\n\nRate used to calculate the tax.\n"
-                                    }
-                                  ]
-                                },
-                                "TaxblBaseAmt": {
-                                  "allOf": [
-                                    {
-                                      "title": "ActiveOrHistoricCurrencyAndAmount",
-                                      "type": "object",
-                                      "description": "A number of monetary units specified in an active or a historic currency where the unit of currency is explicit and compliant with ISO 4217.\n",
-                                      "properties": {
-                                        "ActiveOrHistoricCurrencyAndAmount": {
-                                          "allOf": [
-                                            {
-                                              "title": "ActiveOrHistoricCurrencyAndAmount_SimpleType",
-                                              "type": "string",
-                                              "example": 123.45,
-                                              "pattern": "^(?!0\\d)(\\d{1,18}|\\d{1,17}.\\d{1}|\\d{1,16}.\\d{1,2}|\\d{1,15}.\\d{1,3}|\\d{1,14}.\\d{1,4}|\\d{1,13}.\\d{1,5})$"
-                                            },
-                                            {
-                                              "description": "Amount of money to be moved between the debtor and creditor, before deduction of charges, expressed in the currency as ordered by the initiating party.\n"
-                                            }
-                                          ]
-                                        },
-                                        "Ccy": {
-                                          "allOf": [
-                                            {
-                                              "title": "ActiveOrHistoricCurrencyCode",
-                                              "type": "string",
-                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                              "pattern": "^[A-Z]{3,3}$",
-                                              "example": "USD"
-                                            },
-                                            {
-                                              "description": "Currency\nIdentification of the currency in which the account is held.\n"
-                                            }
-                                          ]
-                                        }
-                                      },
-                                      "required": [
-                                        "ActiveOrHistoricCurrencyAndAmount",
-                                        "Ccy"
-                                      ],
-                                      "example": {
-                                        "ActiveOrHistoricCurrencyAndAmount": 123.45,
-                                        "Ccy": "USD"
-                                      }
-                                    },
-                                    {
-                                      "description": "TaxableBaseAmount\n\nAmount of money on which the tax is based.\n"
-                                    }
-                                  ]
-                                },
-                                "TtlAmt": {
-                                  "allOf": [
-                                    {
-                                      "title": "ActiveOrHistoricCurrencyAndAmount",
-                                      "type": "object",
-                                      "description": "A number of monetary units specified in an active or a historic currency where the unit of currency is explicit and compliant with ISO 4217.\n",
-                                      "properties": {
-                                        "ActiveOrHistoricCurrencyAndAmount": {
-                                          "allOf": [
-                                            {
-                                              "title": "ActiveOrHistoricCurrencyAndAmount_SimpleType",
-                                              "type": "string",
-                                              "example": 123.45,
-                                              "pattern": "^(?!0\\d)(\\d{1,18}|\\d{1,17}.\\d{1}|\\d{1,16}.\\d{1,2}|\\d{1,15}.\\d{1,3}|\\d{1,14}.\\d{1,4}|\\d{1,13}.\\d{1,5})$"
-                                            },
-                                            {
-                                              "description": "Amount of money to be moved between the debtor and creditor, before deduction of charges, expressed in the currency as ordered by the initiating party.\n"
-                                            }
-                                          ]
-                                        },
-                                        "Ccy": {
-                                          "allOf": [
-                                            {
-                                              "title": "ActiveOrHistoricCurrencyCode",
-                                              "type": "string",
-                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                              "pattern": "^[A-Z]{3,3}$",
-                                              "example": "USD"
-                                            },
-                                            {
-                                              "description": "Currency\nIdentification of the currency in which the account is held.\n"
-                                            }
-                                          ]
-                                        }
-                                      },
-                                      "required": [
-                                        "ActiveOrHistoricCurrencyAndAmount",
-                                        "Ccy"
-                                      ],
-                                      "example": {
-                                        "ActiveOrHistoricCurrencyAndAmount": 123.45,
-                                        "Ccy": "USD"
-                                      }
-                                    },
-                                    {
-                                      "description": "TotalAmount\n\nTotal amount that is the result of the calculation of the tax for the record.\n"
-                                    }
-                                  ]
-                                },
-                                "Dtls": {
-                                  "description": "Details\n\nSet of elements used to provide details on the tax period and amount.\n",
-                                  "anyOf": [
-                                    {
-                                      "title": "TaxRecordDetails3",
-                                      "description": "Details on the tax period and amount.\n",
-                                      "type": "object",
-                                      "properties": {
-                                        "Prd": {
-                                          "allOf": [
-                                            {
-                                              "title": "TaxPeriod3",
-                                              "description": "Period of time details related to the tax payment.\n",
-                                              "type": "object",
-                                              "properties": {
-                                                "FrToDt": {
-                                                  "allOf": [
-                                                    {
-                                                      "title": "DatePeriod2",
-                                                      "description": "Range of time defined by a start date and an end date.\n",
-                                                      "type": "object",
-                                                      "properties": {
-                                                        "FrDt": {
-                                                          "allOf": [
-                                                            {
-                                                              "title": "ISODate",
-                                                              "description": "A particular point in the progression of time in a calendar year expressed in the YYYY-MM-DD format. This representation is defined in \"XML Schema Part 2: Datatypes Second Edition - W3C Recommendation 28 October 2004\" which is aligned with ISO 8601.\n",
-                                                              "type": "string",
-                                                              "format": "date",
-                                                              "example": "2013-03-07"
-                                                            },
-                                                            {
-                                                              "description": "FromDate\nStart date of the range.\n"
-                                                            }
-                                                          ]
-                                                        },
-                                                        "ToDt": {
-                                                          "allOf": [
-                                                            {
-                                                              "title": "ISODate",
-                                                              "description": "A particular point in the progression of time in a calendar year expressed in the YYYY-MM-DD format. This representation is defined in \"XML Schema Part 2: Datatypes Second Edition - W3C Recommendation 28 October 2004\" which is aligned with ISO 8601.\n",
-                                                              "type": "string",
-                                                              "format": "date",
-                                                              "example": "2013-03-07"
-                                                            },
-                                                            {
-                                                              "description": "ToDate\nEnd date of the range.\n"
-                                                            }
-                                                          ]
-                                                        }
-                                                      },
-                                                      "required": [
-                                                        "FrDt",
-                                                        "ToDt"
-                                                      ],
-                                                      "example": {
-                                                        "FrDt": "2022-01-01",
-                                                        "ToDt": "2022-12-31"
-                                                      }
-                                                    },
-                                                    {
-                                                      "description": "FromToDate\n\nRange of time between a start date and an end date for which the tax report is provided.\n"
-                                                    }
-                                                  ]
-                                                },
-                                                "Tp": {
-                                                  "allOf": [
-                                                    {
-                                                      "title": "TaxRecordPeriod1Code",
-                                                      "description": "Specifies the period related to the tax payment\n\nMM01 FirstMonth Tax is related to the second month of the period.\nMM02 SecondMonth Tax is related to the first month of the period.\nMM03 ThirdMonth Tax is related to the third month of the period.\nMM04 FourthMonth Tax is related to the fourth month of the period.\nMM05 FifthMonth Tax is related to the fifth month of the period.\nMM06 SixthMonth Tax is related to the sixth month of the period.\nMM07 SeventhMonth Tax is related to the seventh month of the period.\nMM08 EighthMonth Tax is related to the eighth month of the period.\nMM09 NinthMonth Tax is related to the ninth month of the period.\nMM10 TenthMonth Tax is related to the tenth month of the period.\nMM11 EleventhMonth Tax is related to the eleventh month of the period.\nMM12 TwelfthMonth Tax is related to the twelfth month of the period.\nQTR1 FirstQuarter Tax is related to the first quarter of the period.\nQTR2 SecondQuarter Tax is related to the second quarter of the period.\nQTR3 ThirdQuarter Tax is related to the third quarter of the period.\nQTR4 FourthQuarter Tax is related to the forth quarter of the period.\nHLF1 FirstHalf Tax is related to the first half of the period.\nHLF2 SecondHalf Tax is related to the second half of the period.\n",
-                                                      "type": "string",
+                                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                      "example": "USD",
+                                                      "minLength": 3,
+                                                      "maxLength": 3,
                                                       "enum": [
-                                                        "MM01",
-                                                        "MM02",
-                                                        "MM03",
-                                                        "MM04",
-                                                        "MM05",
-                                                        "MM06",
-                                                        "MM07",
-                                                        "MM08",
-                                                        "MM09",
-                                                        "MM10",
-                                                        "MM11",
-                                                        "MM12",
-                                                        "QTR1",
-                                                        "QTR2",
-                                                        "QTR3",
-                                                        "QTR4",
-                                                        "HLF1",
-                                                        "HLF2"
-                                                      ],
-                                                      "example": "HLF1"
-                                                    },
-                                                    {
-                                                      "description": "Type\n\nIdentification of the period related to the tax payment.\n"
-                                                    }
-                                                  ]
-                                                },
-                                                "Yr": {
-                                                  "allOf": [
-                                                    {
-                                                      "title": "ISOYear",
-                                                      "description": "Year represented by YYYY (ISO 8601).\n",
-                                                      "type": "string",
-                                                      "pattern": "^\\d{4}(Z|([+-]\\d{2}:\\d{2})){0,1}$",
-                                                      "example": 2019
-                                                    },
-                                                    {
-                                                      "description": "Year\n\nYear related to the tax payment.\n"
-                                                    }
-                                                  ]
-                                                }
-                                              },
-                                              "example": {
-                                                "Yr": 2020,
-                                                "Tp": "MM01",
-                                                "FrToDt": {
-                                                  "FrDt": "2020-01-01",
-                                                  "ToDt": "2020-01-31"
-                                                }
-                                              }
-                                            },
-                                            {
-                                              "description": "Period\n\nSet of elements used to provide details on the period of time related to the tax payment.\n"
-                                            }
-                                          ]
-                                        },
-                                        "Amt": {
-                                          "allOf": [
-                                            {
-                                              "title": "ActiveOrHistoricCurrencyAndAmount",
-                                              "type": "object",
-                                              "description": "A number of monetary units specified in an active or a historic currency where the unit of currency is explicit and compliant with ISO 4217.\n",
-                                              "properties": {
-                                                "ActiveOrHistoricCurrencyAndAmount": {
-                                                  "allOf": [
-                                                    {
-                                                      "title": "ActiveOrHistoricCurrencyAndAmount_SimpleType",
-                                                      "type": "string",
-                                                      "example": 123.45,
-                                                      "pattern": "^(?!0\\d)(\\d{1,18}|\\d{1,17}.\\d{1}|\\d{1,16}.\\d{1,2}|\\d{1,15}.\\d{1,3}|\\d{1,14}.\\d{1,4}|\\d{1,13}.\\d{1,5})$"
-                                                    },
-                                                    {
-                                                      "description": "Amount of money to be moved between the debtor and creditor, before deduction of charges, expressed in the currency as ordered by the initiating party.\n"
-                                                    }
-                                                  ]
-                                                },
-                                                "Ccy": {
-                                                  "allOf": [
-                                                    {
-                                                      "title": "ActiveOrHistoricCurrencyCode",
-                                                      "type": "string",
-                                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                      "pattern": "^[A-Z]{3,3}$",
-                                                      "example": "USD"
+                                                        "AED",
+                                                        "AFN",
+                                                        "ALL",
+                                                        "AMD",
+                                                        "ANG",
+                                                        "AOA",
+                                                        "ARS",
+                                                        "AUD",
+                                                        "AWG",
+                                                        "AZN",
+                                                        "BAM",
+                                                        "BBD",
+                                                        "BDT",
+                                                        "BGN",
+                                                        "BHD",
+                                                        "BIF",
+                                                        "BMD",
+                                                        "BND",
+                                                        "BOB",
+                                                        "BRL",
+                                                        "BSD",
+                                                        "BTN",
+                                                        "BWP",
+                                                        "BYN",
+                                                        "BZD",
+                                                        "CAD",
+                                                        "CDF",
+                                                        "CHF",
+                                                        "CLP",
+                                                        "CNY",
+                                                        "COP",
+                                                        "CRC",
+                                                        "CUC",
+                                                        "CUP",
+                                                        "CVE",
+                                                        "CZK",
+                                                        "DJF",
+                                                        "DKK",
+                                                        "DOP",
+                                                        "DZD",
+                                                        "EGP",
+                                                        "ERN",
+                                                        "ETB",
+                                                        "EUR",
+                                                        "FJD",
+                                                        "FKP",
+                                                        "GBP",
+                                                        "GEL",
+                                                        "GGP",
+                                                        "GHS",
+                                                        "GIP",
+                                                        "GMD",
+                                                        "GNF",
+                                                        "GTQ",
+                                                        "GYD",
+                                                        "HKD",
+                                                        "HNL",
+                                                        "HRK",
+                                                        "HTG",
+                                                        "HUF",
+                                                        "IDR",
+                                                        "ILS",
+                                                        "IMP",
+                                                        "INR",
+                                                        "IQD",
+                                                        "IRR",
+                                                        "ISK",
+                                                        "JEP",
+                                                        "JMD",
+                                                        "JOD",
+                                                        "JPY",
+                                                        "KES",
+                                                        "KGS",
+                                                        "KHR",
+                                                        "KMF",
+                                                        "KPW",
+                                                        "KRW",
+                                                        "KWD",
+                                                        "KYD",
+                                                        "KZT",
+                                                        "LAK",
+                                                        "LBP",
+                                                        "LKR",
+                                                        "LRD",
+                                                        "LSL",
+                                                        "LYD",
+                                                        "MAD",
+                                                        "MDL",
+                                                        "MGA",
+                                                        "MKD",
+                                                        "MMK",
+                                                        "MNT",
+                                                        "MOP",
+                                                        "MRO",
+                                                        "MUR",
+                                                        "MVR",
+                                                        "MWK",
+                                                        "MXN",
+                                                        "MYR",
+                                                        "MZN",
+                                                        "NAD",
+                                                        "NGN",
+                                                        "NIO",
+                                                        "NOK",
+                                                        "NPR",
+                                                        "NZD",
+                                                        "OMR",
+                                                        "PAB",
+                                                        "PEN",
+                                                        "PGK",
+                                                        "PHP",
+                                                        "PKR",
+                                                        "PLN",
+                                                        "PYG",
+                                                        "QAR",
+                                                        "RON",
+                                                        "RSD",
+                                                        "RUB",
+                                                        "RWF",
+                                                        "SAR",
+                                                        "SBD",
+                                                        "SCR",
+                                                        "SDG",
+                                                        "SEK",
+                                                        "SGD",
+                                                        "SHP",
+                                                        "SLL",
+                                                        "SOS",
+                                                        "SPL",
+                                                        "SRD",
+                                                        "STD",
+                                                        "SVC",
+                                                        "SYP",
+                                                        "SZL",
+                                                        "THB",
+                                                        "TJS",
+                                                        "TMT",
+                                                        "TND",
+                                                        "TOP",
+                                                        "TRY",
+                                                        "TTD",
+                                                        "TVD",
+                                                        "TWD",
+                                                        "TZS",
+                                                        "UAH",
+                                                        "UGX",
+                                                        "USD",
+                                                        "UYU",
+                                                        "UZS",
+                                                        "VEF",
+                                                        "VND",
+                                                        "VUV",
+                                                        "WST",
+                                                        "XAF",
+                                                        "XCD",
+                                                        "XDR",
+                                                        "XOF",
+                                                        "XPF",
+                                                        "XTS",
+                                                        "XXX",
+                                                        "YER",
+                                                        "ZAR",
+                                                        "ZMW",
+                                                        "ZWD"
+                                                      ]
+                                                    },
+                                                    {
+                                                      "description": "Currency\nIdentification of the currency in which the account is held.\n"
+                                                    }
+                                                  ]
+                                                }
+                                              },
+                                              "required": [
+                                                "ActiveOrHistoricCurrencyAndAmount",
+                                                "Ccy"
+                                              ],
+                                              "example": {
+                                                "ActiveOrHistoricCurrencyAndAmount": 123.45,
+                                                "Ccy": "USD"
+                                              }
+                                            },
+                                            {
+                                              "description": "Amount\n\nUnderlying tax amount related to the specified period.\n"
+                                            }
+                                          ]
+                                        }
+                                      },
+                                      "required": [
+                                        "Amt"
+                                      ],
+                                      "example": {
+                                        "Prd": {
+                                          "Yr": 2020,
+                                          "Tp": "MM01",
+                                          "FrToDt": {
+                                            "FrDt": "2020-01-01",
+                                            "ToDt": "2020-01-31"
+                                          }
+                                        },
+                                        "Amt": {
+                                          "Amt": 100,
+                                          "Ccy": "EUR"
+                                        }
+                                      }
+                                    },
+                                    "type": "array"
+                                  }
+                                ]
+                              }
+                            },
+                            "example": {
+                              "Rate": 0,
+                              "TaxblBaseAmt": {
+                                "Ccy": "EUR",
+                                "Amt": 0
+                              },
+                              "TtlAmt": {
+                                "Ccy": "EUR",
+                                "Amt": 0
+                              },
+                              "Dtls": {
+                                "Tp": "T1",
+                                "Ctry": "CH",
+                                "Cd": "CHF",
+                                "Amt": {
+                                  "Ccy": "CHF",
+                                  "Amt": 1000
+                                },
+                                "Inf": 12345
+                              }
+                            }
+                          },
+                          {
+                            "description": "TaxAmount\n\nSet of elements used to provide information on the amount of the tax record.\n"
+                          }
+                        ]
+                      },
+                      "Tp": {
+                        "allOf": [
+                          {
+                            "title": "Max35Text",
+                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 35,
+                            "example": 1.234567890123457e+34
+                          },
+                          {
+                            "description": "Type\n\nHigh level code to identify the type of tax details.\n"
+                          }
+                        ]
+                      }
+                    },
+                    "example": {
+                      "Tp": "VAT",
+                      "Ctgy": "A",
+                      "CtgyDtls": "Standard",
+                      "DbtrSts": "Resident",
+                      "CertId": 123456789,
+                      "FrmsCd": 123456789,
+                      "Prd": {
+                        "Yr": 2019,
+                        "Tp": "MM01",
+                        "FrToDt": {
+                          "FrDt": "2019-01-01",
+                          "ToDt": "2019-12-31"
+                        }
+                      },
+                      "TaxAmt": {
+                        "Rate": 0.2,
+                        "TaxblBaseAmt": {
+                          "Ccy": "EUR",
+                          "Amt": 1000
+                        },
+                        "TtlAmt": {
+                          "Ccy": "EUR",
+                          "Amt": 200
+                        }
+                      },
+                      "AddtlInf": "VAT applicable"
+                    }
+                  },
+                  {
+                    "items": {
+                      "title": "TaxRecord3",
+                      "description": "Set of elements used to define the tax record.\n",
+                      "type": "object",
+                      "properties": {
+                        "AddtlInf": {
+                          "allOf": [
+                            {
+                              "title": "Max140Text",
+                              "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                              "type": "string",
+                              "minLength": 1,
+                              "maxLength": 140,
+                              "example": 12345
+                            },
+                            {
+                              "description": "AdditionalInformation\n\nFurther details of the tax record.\n"
+                            }
+                          ]
+                        },
+                        "CertId": {
+                          "allOf": [
+                            {
+                              "title": "Max35Text",
+                              "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                              "type": "string",
+                              "minLength": 1,
+                              "maxLength": 35,
+                              "example": 1.234567890123457e+34
+                            },
+                            {
+                              "description": "CertificateIdentification\n\nIdentification number of the tax report as assigned by the taxing authority.\n"
+                            }
+                          ]
+                        },
+                        "Ctgy": {
+                          "allOf": [
+                            {
+                              "title": "Max35Text",
+                              "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                              "type": "string",
+                              "minLength": 1,
+                              "maxLength": 35,
+                              "example": 1.234567890123457e+34
+                            },
+                            {
+                              "description": "Category\n\nSpecifies the tax code as published by the tax authority.\n"
+                            }
+                          ]
+                        },
+                        "CtgyDtls": {
+                          "allOf": [
+                            {
+                              "title": "Max35Text",
+                              "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                              "type": "string",
+                              "minLength": 1,
+                              "maxLength": 35,
+                              "example": 1.234567890123457e+34
+                            },
+                            {
+                              "description": "CategoryDetails\n\nProvides further details of the category tax code.\n"
+                            }
+                          ]
+                        },
+                        "DbtrSts": {
+                          "allOf": [
+                            {
+                              "title": "Max35Text",
+                              "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                              "type": "string",
+                              "minLength": 1,
+                              "maxLength": 35,
+                              "example": 1.234567890123457e+34
+                            },
+                            {
+                              "description": "DebtorStatus\n\nCode provided by local authority to identify the status of the party that has drawn up the settlement document.\n"
+                            }
+                          ]
+                        },
+                        "FrmsCd": {
+                          "allOf": [
+                            {
+                              "title": "Max35Text",
+                              "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                              "type": "string",
+                              "minLength": 1,
+                              "maxLength": 35,
+                              "example": 1.234567890123457e+34
+                            },
+                            {
+                              "description": "FormsCode\n\nIdentifies, in a coded form, on which template the tax report is to be provided.\n"
+                            }
+                          ]
+                        },
+                        "Prd": {
+                          "allOf": [
+                            {
+                              "title": "TaxPeriod3",
+                              "description": "Period of time details related to the tax payment.\n",
+                              "type": "object",
+                              "properties": {
+                                "FrToDt": {
+                                  "allOf": [
+                                    {
+                                      "title": "DatePeriod2",
+                                      "description": "Range of time defined by a start date and an end date.\n",
+                                      "type": "object",
+                                      "properties": {
+                                        "FrDt": {
+                                          "allOf": [
+                                            {
+                                              "title": "ISODate",
+                                              "description": "A particular point in the progression of time in a calendar year expressed in the YYYY-MM-DD format. This representation is defined in \"XML Schema Part 2: Datatypes Second Edition - W3C Recommendation 28 October 2004\" which is aligned with ISO 8601.\n",
+                                              "type": "string",
+                                              "format": "date",
+                                              "example": "2013-03-07"
+                                            },
+                                            {
+                                              "description": "FromDate\nStart date of the range.\n"
+                                            }
+                                          ]
+                                        },
+                                        "ToDt": {
+                                          "allOf": [
+                                            {
+                                              "title": "ISODate",
+                                              "description": "A particular point in the progression of time in a calendar year expressed in the YYYY-MM-DD format. This representation is defined in \"XML Schema Part 2: Datatypes Second Edition - W3C Recommendation 28 October 2004\" which is aligned with ISO 8601.\n",
+                                              "type": "string",
+                                              "format": "date",
+                                              "example": "2013-03-07"
+                                            },
+                                            {
+                                              "description": "ToDate\nEnd date of the range.\n"
+                                            }
+                                          ]
+                                        }
+                                      },
+                                      "required": [
+                                        "FrDt",
+                                        "ToDt"
+                                      ],
+                                      "example": {
+                                        "FrDt": "2022-01-01",
+                                        "ToDt": "2022-12-31"
+                                      }
+                                    },
+                                    {
+                                      "description": "FromToDate\n\nRange of time between a start date and an end date for which the tax report is provided.\n"
+                                    }
+                                  ]
+                                },
+                                "Tp": {
+                                  "allOf": [
+                                    {
+                                      "title": "TaxRecordPeriod1Code",
+                                      "description": "Specifies the period related to the tax payment\n\nMM01 FirstMonth Tax is related to the second month of the period.\nMM02 SecondMonth Tax is related to the first month of the period.\nMM03 ThirdMonth Tax is related to the third month of the period.\nMM04 FourthMonth Tax is related to the fourth month of the period.\nMM05 FifthMonth Tax is related to the fifth month of the period.\nMM06 SixthMonth Tax is related to the sixth month of the period.\nMM07 SeventhMonth Tax is related to the seventh month of the period.\nMM08 EighthMonth Tax is related to the eighth month of the period.\nMM09 NinthMonth Tax is related to the ninth month of the period.\nMM10 TenthMonth Tax is related to the tenth month of the period.\nMM11 EleventhMonth Tax is related to the eleventh month of the period.\nMM12 TwelfthMonth Tax is related to the twelfth month of the period.\nQTR1 FirstQuarter Tax is related to the first quarter of the period.\nQTR2 SecondQuarter Tax is related to the second quarter of the period.\nQTR3 ThirdQuarter Tax is related to the third quarter of the period.\nQTR4 FourthQuarter Tax is related to the forth quarter of the period.\nHLF1 FirstHalf Tax is related to the first half of the period.\nHLF2 SecondHalf Tax is related to the second half of the period.\n",
+                                      "type": "string",
+                                      "enum": [
+                                        "MM01",
+                                        "MM02",
+                                        "MM03",
+                                        "MM04",
+                                        "MM05",
+                                        "MM06",
+                                        "MM07",
+                                        "MM08",
+                                        "MM09",
+                                        "MM10",
+                                        "MM11",
+                                        "MM12",
+                                        "QTR1",
+                                        "QTR2",
+                                        "QTR3",
+                                        "QTR4",
+                                        "HLF1",
+                                        "HLF2"
+                                      ],
+                                      "example": "HLF1"
+                                    },
+                                    {
+                                      "description": "Type\n\nIdentification of the period related to the tax payment.\n"
+                                    }
+                                  ]
+                                },
+                                "Yr": {
+                                  "allOf": [
+                                    {
+                                      "title": "ISOYear",
+                                      "description": "Year represented by YYYY (ISO 8601).\n",
+                                      "type": "string",
+                                      "pattern": "^\\d{4}(Z|([+-]\\d{2}:\\d{2})){0,1}$",
+                                      "example": 2019
+                                    },
+                                    {
+                                      "description": "Year\n\nYear related to the tax payment.\n"
+                                    }
+                                  ]
+                                }
+                              },
+                              "example": {
+                                "Yr": 2020,
+                                "Tp": "MM01",
+                                "FrToDt": {
+                                  "FrDt": "2020-01-01",
+                                  "ToDt": "2020-01-31"
+                                }
+                              }
+                            },
+                            {
+                              "description": "Period\n\nSet of elements used to provide details on the period of time related to the tax payment.\n"
+                            }
+                          ]
+                        },
+                        "TaxAmt": {
+                          "allOf": [
+                            {
+                              "title": "TaxAmount3",
+                              "description": "Information on the amount of the tax record.\n",
+                              "type": "object",
+                              "properties": {
+                                "Rate": {
+                                  "allOf": [
+                                    {
+                                      "title": "PercentageRate",
+                                      "type": "string",
+                                      "example": 1234,
+                                      "pattern": "^(?!0\\d)(\\d{1,11}|\\d{1,10}.\\d{1}|\\d{1,9}.\\d{1,2}|\\d{1,8}.\\d{1,3}|\\d{1,7}.\\d{1,4}|\\d{1,6}.\\d{1,5}|\\d{1,5}.\\d{1,6}|\\d{1,4}.\\d{1,7}|\\d{1,3}.\\d{1,8}|\\d{1,2}.\\d{1,9}|\\d{1}.\\d{1,10})$"
+                                    },
+                                    {
+                                      "description": "Rate\n\nRate used to calculate the tax.\n"
+                                    }
+                                  ]
+                                },
+                                "TaxblBaseAmt": {
+                                  "allOf": [
+                                    {
+                                      "title": "ActiveOrHistoricCurrencyAndAmount",
+                                      "type": "object",
+                                      "description": "A number of monetary units specified in an active or a historic currency where the unit of currency is explicit and compliant with ISO 4217.\n",
+                                      "properties": {
+                                        "ActiveOrHistoricCurrencyAndAmount": {
+                                          "allOf": [
+                                            {
+                                              "title": "ActiveOrHistoricCurrencyAndAmount_SimpleType",
+                                              "type": "string",
+                                              "example": 123.45,
+                                              "pattern": "^(?!0\\d)(\\d{1,18}|\\d{1,17}.\\d{1}|\\d{1,16}.\\d{1,2}|\\d{1,15}.\\d{1,3}|\\d{1,14}.\\d{1,4}|\\d{1,13}.\\d{1,5})$"
+                                            },
+                                            {
+                                              "description": "Amount of money to be moved between the debtor and creditor, before deduction of charges, expressed in the currency as ordered by the initiating party.\n"
+                                            }
+                                          ]
+                                        },
+                                        "Ccy": {
+                                          "allOf": [
+                                            {
+                                              "title": "ActiveOrHistoricCurrencyCode",
+                                              "type": "string",
+                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                              "example": "USD",
+                                              "minLength": 3,
+                                              "maxLength": 3,
+                                              "enum": [
+                                                "AED",
+                                                "AFN",
+                                                "ALL",
+                                                "AMD",
+                                                "ANG",
+                                                "AOA",
+                                                "ARS",
+                                                "AUD",
+                                                "AWG",
+                                                "AZN",
+                                                "BAM",
+                                                "BBD",
+                                                "BDT",
+                                                "BGN",
+                                                "BHD",
+                                                "BIF",
+                                                "BMD",
+                                                "BND",
+                                                "BOB",
+                                                "BRL",
+                                                "BSD",
+                                                "BTN",
+                                                "BWP",
+                                                "BYN",
+                                                "BZD",
+                                                "CAD",
+                                                "CDF",
+                                                "CHF",
+                                                "CLP",
+                                                "CNY",
+                                                "COP",
+                                                "CRC",
+                                                "CUC",
+                                                "CUP",
+                                                "CVE",
+                                                "CZK",
+                                                "DJF",
+                                                "DKK",
+                                                "DOP",
+                                                "DZD",
+                                                "EGP",
+                                                "ERN",
+                                                "ETB",
+                                                "EUR",
+                                                "FJD",
+                                                "FKP",
+                                                "GBP",
+                                                "GEL",
+                                                "GGP",
+                                                "GHS",
+                                                "GIP",
+                                                "GMD",
+                                                "GNF",
+                                                "GTQ",
+                                                "GYD",
+                                                "HKD",
+                                                "HNL",
+                                                "HRK",
+                                                "HTG",
+                                                "HUF",
+                                                "IDR",
+                                                "ILS",
+                                                "IMP",
+                                                "INR",
+                                                "IQD",
+                                                "IRR",
+                                                "ISK",
+                                                "JEP",
+                                                "JMD",
+                                                "JOD",
+                                                "JPY",
+                                                "KES",
+                                                "KGS",
+                                                "KHR",
+                                                "KMF",
+                                                "KPW",
+                                                "KRW",
+                                                "KWD",
+                                                "KYD",
+                                                "KZT",
+                                                "LAK",
+                                                "LBP",
+                                                "LKR",
+                                                "LRD",
+                                                "LSL",
+                                                "LYD",
+                                                "MAD",
+                                                "MDL",
+                                                "MGA",
+                                                "MKD",
+                                                "MMK",
+                                                "MNT",
+                                                "MOP",
+                                                "MRO",
+                                                "MUR",
+                                                "MVR",
+                                                "MWK",
+                                                "MXN",
+                                                "MYR",
+                                                "MZN",
+                                                "NAD",
+                                                "NGN",
+                                                "NIO",
+                                                "NOK",
+                                                "NPR",
+                                                "NZD",
+                                                "OMR",
+                                                "PAB",
+                                                "PEN",
+                                                "PGK",
+                                                "PHP",
+                                                "PKR",
+                                                "PLN",
+                                                "PYG",
+                                                "QAR",
+                                                "RON",
+                                                "RSD",
+                                                "RUB",
+                                                "RWF",
+                                                "SAR",
+                                                "SBD",
+                                                "SCR",
+                                                "SDG",
+                                                "SEK",
+                                                "SGD",
+                                                "SHP",
+                                                "SLL",
+                                                "SOS",
+                                                "SPL",
+                                                "SRD",
+                                                "STD",
+                                                "SVC",
+                                                "SYP",
+                                                "SZL",
+                                                "THB",
+                                                "TJS",
+                                                "TMT",
+                                                "TND",
+                                                "TOP",
+                                                "TRY",
+                                                "TTD",
+                                                "TVD",
+                                                "TWD",
+                                                "TZS",
+                                                "UAH",
+                                                "UGX",
+                                                "USD",
+                                                "UYU",
+                                                "UZS",
+                                                "VEF",
+                                                "VND",
+                                                "VUV",
+                                                "WST",
+                                                "XAF",
+                                                "XCD",
+                                                "XDR",
+                                                "XOF",
+                                                "XPF",
+                                                "XTS",
+                                                "XXX",
+                                                "YER",
+                                                "ZAR",
+                                                "ZMW",
+                                                "ZWD"
+                                              ]
+                                            },
+                                            {
+                                              "description": "Currency\nIdentification of the currency in which the account is held.\n"
+                                            }
+                                          ]
+                                        }
+                                      },
+                                      "required": [
+                                        "ActiveOrHistoricCurrencyAndAmount",
+                                        "Ccy"
+                                      ],
+                                      "example": {
+                                        "ActiveOrHistoricCurrencyAndAmount": 123.45,
+                                        "Ccy": "USD"
+                                      }
+                                    },
+                                    {
+                                      "description": "TaxableBaseAmount\n\nAmount of money on which the tax is based.\n"
+                                    }
+                                  ]
+                                },
+                                "TtlAmt": {
+                                  "allOf": [
+                                    {
+                                      "title": "ActiveOrHistoricCurrencyAndAmount",
+                                      "type": "object",
+                                      "description": "A number of monetary units specified in an active or a historic currency where the unit of currency is explicit and compliant with ISO 4217.\n",
+                                      "properties": {
+                                        "ActiveOrHistoricCurrencyAndAmount": {
+                                          "allOf": [
+                                            {
+                                              "title": "ActiveOrHistoricCurrencyAndAmount_SimpleType",
+                                              "type": "string",
+                                              "example": 123.45,
+                                              "pattern": "^(?!0\\d)(\\d{1,18}|\\d{1,17}.\\d{1}|\\d{1,16}.\\d{1,2}|\\d{1,15}.\\d{1,3}|\\d{1,14}.\\d{1,4}|\\d{1,13}.\\d{1,5})$"
+                                            },
+                                            {
+                                              "description": "Amount of money to be moved between the debtor and creditor, before deduction of charges, expressed in the currency as ordered by the initiating party.\n"
+                                            }
+                                          ]
+                                        },
+                                        "Ccy": {
+                                          "allOf": [
+                                            {
+                                              "title": "ActiveOrHistoricCurrencyCode",
+                                              "type": "string",
+                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                              "example": "USD",
+                                              "minLength": 3,
+                                              "maxLength": 3,
+                                              "enum": [
+                                                "AED",
+                                                "AFN",
+                                                "ALL",
+                                                "AMD",
+                                                "ANG",
+                                                "AOA",
+                                                "ARS",
+                                                "AUD",
+                                                "AWG",
+                                                "AZN",
+                                                "BAM",
+                                                "BBD",
+                                                "BDT",
+                                                "BGN",
+                                                "BHD",
+                                                "BIF",
+                                                "BMD",
+                                                "BND",
+                                                "BOB",
+                                                "BRL",
+                                                "BSD",
+                                                "BTN",
+                                                "BWP",
+                                                "BYN",
+                                                "BZD",
+                                                "CAD",
+                                                "CDF",
+                                                "CHF",
+                                                "CLP",
+                                                "CNY",
+                                                "COP",
+                                                "CRC",
+                                                "CUC",
+                                                "CUP",
+                                                "CVE",
+                                                "CZK",
+                                                "DJF",
+                                                "DKK",
+                                                "DOP",
+                                                "DZD",
+                                                "EGP",
+                                                "ERN",
+                                                "ETB",
+                                                "EUR",
+                                                "FJD",
+                                                "FKP",
+                                                "GBP",
+                                                "GEL",
+                                                "GGP",
+                                                "GHS",
+                                                "GIP",
+                                                "GMD",
+                                                "GNF",
+                                                "GTQ",
+                                                "GYD",
+                                                "HKD",
+                                                "HNL",
+                                                "HRK",
+                                                "HTG",
+                                                "HUF",
+                                                "IDR",
+                                                "ILS",
+                                                "IMP",
+                                                "INR",
+                                                "IQD",
+                                                "IRR",
+                                                "ISK",
+                                                "JEP",
+                                                "JMD",
+                                                "JOD",
+                                                "JPY",
+                                                "KES",
+                                                "KGS",
+                                                "KHR",
+                                                "KMF",
+                                                "KPW",
+                                                "KRW",
+                                                "KWD",
+                                                "KYD",
+                                                "KZT",
+                                                "LAK",
+                                                "LBP",
+                                                "LKR",
+                                                "LRD",
+                                                "LSL",
+                                                "LYD",
+                                                "MAD",
+                                                "MDL",
+                                                "MGA",
+                                                "MKD",
+                                                "MMK",
+                                                "MNT",
+                                                "MOP",
+                                                "MRO",
+                                                "MUR",
+                                                "MVR",
+                                                "MWK",
+                                                "MXN",
+                                                "MYR",
+                                                "MZN",
+                                                "NAD",
+                                                "NGN",
+                                                "NIO",
+                                                "NOK",
+                                                "NPR",
+                                                "NZD",
+                                                "OMR",
+                                                "PAB",
+                                                "PEN",
+                                                "PGK",
+                                                "PHP",
+                                                "PKR",
+                                                "PLN",
+                                                "PYG",
+                                                "QAR",
+                                                "RON",
+                                                "RSD",
+                                                "RUB",
+                                                "RWF",
+                                                "SAR",
+                                                "SBD",
+                                                "SCR",
+                                                "SDG",
+                                                "SEK",
+                                                "SGD",
+                                                "SHP",
+                                                "SLL",
+                                                "SOS",
+                                                "SPL",
+                                                "SRD",
+                                                "STD",
+                                                "SVC",
+                                                "SYP",
+                                                "SZL",
+                                                "THB",
+                                                "TJS",
+                                                "TMT",
+                                                "TND",
+                                                "TOP",
+                                                "TRY",
+                                                "TTD",
+                                                "TVD",
+                                                "TWD",
+                                                "TZS",
+                                                "UAH",
+                                                "UGX",
+                                                "USD",
+                                                "UYU",
+                                                "UZS",
+                                                "VEF",
+                                                "VND",
+                                                "VUV",
+                                                "WST",
+                                                "XAF",
+                                                "XCD",
+                                                "XDR",
+                                                "XOF",
+                                                "XPF",
+                                                "XTS",
+                                                "XXX",
+                                                "YER",
+                                                "ZAR",
+                                                "ZMW",
+                                                "ZWD"
+                                              ]
+                                            },
+                                            {
+                                              "description": "Currency\nIdentification of the currency in which the account is held.\n"
+                                            }
+                                          ]
+                                        }
+                                      },
+                                      "required": [
+                                        "ActiveOrHistoricCurrencyAndAmount",
+                                        "Ccy"
+                                      ],
+                                      "example": {
+                                        "ActiveOrHistoricCurrencyAndAmount": 123.45,
+                                        "Ccy": "USD"
+                                      }
+                                    },
+                                    {
+                                      "description": "TotalAmount\n\nTotal amount that is the result of the calculation of the tax for the record.\n"
+                                    }
+                                  ]
+                                },
+                                "Dtls": {
+                                  "description": "Details\n\nSet of elements used to provide details on the tax period and amount.\n",
+                                  "anyOf": [
+                                    {
+                                      "title": "TaxRecordDetails3",
+                                      "description": "Details on the tax period and amount.\n",
+                                      "type": "object",
+                                      "properties": {
+                                        "Prd": {
+                                          "allOf": [
+                                            {
+                                              "title": "TaxPeriod3",
+                                              "description": "Period of time details related to the tax payment.\n",
+                                              "type": "object",
+                                              "properties": {
+                                                "FrToDt": {
+                                                  "allOf": [
+                                                    {
+                                                      "title": "DatePeriod2",
+                                                      "description": "Range of time defined by a start date and an end date.\n",
+                                                      "type": "object",
+                                                      "properties": {
+                                                        "FrDt": {
+                                                          "allOf": [
+                                                            {
+                                                              "title": "ISODate",
+                                                              "description": "A particular point in the progression of time in a calendar year expressed in the YYYY-MM-DD format. This representation is defined in \"XML Schema Part 2: Datatypes Second Edition - W3C Recommendation 28 October 2004\" which is aligned with ISO 8601.\n",
+                                                              "type": "string",
+                                                              "format": "date",
+                                                              "example": "2013-03-07"
+                                                            },
+                                                            {
+                                                              "description": "FromDate\nStart date of the range.\n"
+                                                            }
+                                                          ]
+                                                        },
+                                                        "ToDt": {
+                                                          "allOf": [
+                                                            {
+                                                              "title": "ISODate",
+                                                              "description": "A particular point in the progression of time in a calendar year expressed in the YYYY-MM-DD format. This representation is defined in \"XML Schema Part 2: Datatypes Second Edition - W3C Recommendation 28 October 2004\" which is aligned with ISO 8601.\n",
+                                                              "type": "string",
+                                                              "format": "date",
+                                                              "example": "2013-03-07"
+                                                            },
+                                                            {
+                                                              "description": "ToDate\nEnd date of the range.\n"
+                                                            }
+                                                          ]
+                                                        }
+                                                      },
+                                                      "required": [
+                                                        "FrDt",
+                                                        "ToDt"
+                                                      ],
+                                                      "example": {
+                                                        "FrDt": "2022-01-01",
+                                                        "ToDt": "2022-12-31"
+                                                      }
+                                                    },
+                                                    {
+                                                      "description": "FromToDate\n\nRange of time between a start date and an end date for which the tax report is provided.\n"
+                                                    }
+                                                  ]
+                                                },
+                                                "Tp": {
+                                                  "allOf": [
+                                                    {
+                                                      "title": "TaxRecordPeriod1Code",
+                                                      "description": "Specifies the period related to the tax payment\n\nMM01 FirstMonth Tax is related to the second month of the period.\nMM02 SecondMonth Tax is related to the first month of the period.\nMM03 ThirdMonth Tax is related to the third month of the period.\nMM04 FourthMonth Tax is related to the fourth month of the period.\nMM05 FifthMonth Tax is related to the fifth month of the period.\nMM06 SixthMonth Tax is related to the sixth month of the period.\nMM07 SeventhMonth Tax is related to the seventh month of the period.\nMM08 EighthMonth Tax is related to the eighth month of the period.\nMM09 NinthMonth Tax is related to the ninth month of the period.\nMM10 TenthMonth Tax is related to the tenth month of the period.\nMM11 EleventhMonth Tax is related to the eleventh month of the period.\nMM12 TwelfthMonth Tax is related to the twelfth month of the period.\nQTR1 FirstQuarter Tax is related to the first quarter of the period.\nQTR2 SecondQuarter Tax is related to the second quarter of the period.\nQTR3 ThirdQuarter Tax is related to the third quarter of the period.\nQTR4 FourthQuarter Tax is related to the forth quarter of the period.\nHLF1 FirstHalf Tax is related to the first half of the period.\nHLF2 SecondHalf Tax is related to the second half of the period.\n",
+                                                      "type": "string",
+                                                      "enum": [
+                                                        "MM01",
+                                                        "MM02",
+                                                        "MM03",
+                                                        "MM04",
+                                                        "MM05",
+                                                        "MM06",
+                                                        "MM07",
+                                                        "MM08",
+                                                        "MM09",
+                                                        "MM10",
+                                                        "MM11",
+                                                        "MM12",
+                                                        "QTR1",
+                                                        "QTR2",
+                                                        "QTR3",
+                                                        "QTR4",
+                                                        "HLF1",
+                                                        "HLF2"
+                                                      ],
+                                                      "example": "HLF1"
+                                                    },
+                                                    {
+                                                      "description": "Type\n\nIdentification of the period related to the tax payment.\n"
+                                                    }
+                                                  ]
+                                                },
+                                                "Yr": {
+                                                  "allOf": [
+                                                    {
+                                                      "title": "ISOYear",
+                                                      "description": "Year represented by YYYY (ISO 8601).\n",
+                                                      "type": "string",
+                                                      "pattern": "^\\d{4}(Z|([+-]\\d{2}:\\d{2})){0,1}$",
+                                                      "example": 2019
+                                                    },
+                                                    {
+                                                      "description": "Year\n\nYear related to the tax payment.\n"
+                                                    }
+                                                  ]
+                                                }
+                                              },
+                                              "example": {
+                                                "Yr": 2020,
+                                                "Tp": "MM01",
+                                                "FrToDt": {
+                                                  "FrDt": "2020-01-01",
+                                                  "ToDt": "2020-01-31"
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "description": "Period\n\nSet of elements used to provide details on the period of time related to the tax payment.\n"
+                                            }
+                                          ]
+                                        },
+                                        "Amt": {
+                                          "allOf": [
+                                            {
+                                              "title": "ActiveOrHistoricCurrencyAndAmount",
+                                              "type": "object",
+                                              "description": "A number of monetary units specified in an active or a historic currency where the unit of currency is explicit and compliant with ISO 4217.\n",
+                                              "properties": {
+                                                "ActiveOrHistoricCurrencyAndAmount": {
+                                                  "allOf": [
+                                                    {
+                                                      "title": "ActiveOrHistoricCurrencyAndAmount_SimpleType",
+                                                      "type": "string",
+                                                      "example": 123.45,
+                                                      "pattern": "^(?!0\\d)(\\d{1,18}|\\d{1,17}.\\d{1}|\\d{1,16}.\\d{1,2}|\\d{1,15}.\\d{1,3}|\\d{1,14}.\\d{1,4}|\\d{1,13}.\\d{1,5})$"
+                                                    },
+                                                    {
+                                                      "description": "Amount of money to be moved between the debtor and creditor, before deduction of charges, expressed in the currency as ordered by the initiating party.\n"
+                                                    }
+                                                  ]
+                                                },
+                                                "Ccy": {
+                                                  "allOf": [
+                                                    {
+                                                      "title": "ActiveOrHistoricCurrencyCode",
+                                                      "type": "string",
+                                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                      "example": "USD",
+                                                      "minLength": 3,
+                                                      "maxLength": 3,
+                                                      "enum": [
+                                                        "AED",
+                                                        "AFN",
+                                                        "ALL",
+                                                        "AMD",
+                                                        "ANG",
+                                                        "AOA",
+                                                        "ARS",
+                                                        "AUD",
+                                                        "AWG",
+                                                        "AZN",
+                                                        "BAM",
+                                                        "BBD",
+                                                        "BDT",
+                                                        "BGN",
+                                                        "BHD",
+                                                        "BIF",
+                                                        "BMD",
+                                                        "BND",
+                                                        "BOB",
+                                                        "BRL",
+                                                        "BSD",
+                                                        "BTN",
+                                                        "BWP",
+                                                        "BYN",
+                                                        "BZD",
+                                                        "CAD",
+                                                        "CDF",
+                                                        "CHF",
+                                                        "CLP",
+                                                        "CNY",
+                                                        "COP",
+                                                        "CRC",
+                                                        "CUC",
+                                                        "CUP",
+                                                        "CVE",
+                                                        "CZK",
+                                                        "DJF",
+                                                        "DKK",
+                                                        "DOP",
+                                                        "DZD",
+                                                        "EGP",
+                                                        "ERN",
+                                                        "ETB",
+                                                        "EUR",
+                                                        "FJD",
+                                                        "FKP",
+                                                        "GBP",
+                                                        "GEL",
+                                                        "GGP",
+                                                        "GHS",
+                                                        "GIP",
+                                                        "GMD",
+                                                        "GNF",
+                                                        "GTQ",
+                                                        "GYD",
+                                                        "HKD",
+                                                        "HNL",
+                                                        "HRK",
+                                                        "HTG",
+                                                        "HUF",
+                                                        "IDR",
+                                                        "ILS",
+                                                        "IMP",
+                                                        "INR",
+                                                        "IQD",
+                                                        "IRR",
+                                                        "ISK",
+                                                        "JEP",
+                                                        "JMD",
+                                                        "JOD",
+                                                        "JPY",
+                                                        "KES",
+                                                        "KGS",
+                                                        "KHR",
+                                                        "KMF",
+                                                        "KPW",
+                                                        "KRW",
+                                                        "KWD",
+                                                        "KYD",
+                                                        "KZT",
+                                                        "LAK",
+                                                        "LBP",
+                                                        "LKR",
+                                                        "LRD",
+                                                        "LSL",
+                                                        "LYD",
+                                                        "MAD",
+                                                        "MDL",
+                                                        "MGA",
+                                                        "MKD",
+                                                        "MMK",
+                                                        "MNT",
+                                                        "MOP",
+                                                        "MRO",
+                                                        "MUR",
+                                                        "MVR",
+                                                        "MWK",
+                                                        "MXN",
+                                                        "MYR",
+                                                        "MZN",
+                                                        "NAD",
+                                                        "NGN",
+                                                        "NIO",
+                                                        "NOK",
+                                                        "NPR",
+                                                        "NZD",
+                                                        "OMR",
+                                                        "PAB",
+                                                        "PEN",
+                                                        "PGK",
+                                                        "PHP",
+                                                        "PKR",
+                                                        "PLN",
+                                                        "PYG",
+                                                        "QAR",
+                                                        "RON",
+                                                        "RSD",
+                                                        "RUB",
+                                                        "RWF",
+                                                        "SAR",
+                                                        "SBD",
+                                                        "SCR",
+                                                        "SDG",
+                                                        "SEK",
+                                                        "SGD",
+                                                        "SHP",
+                                                        "SLL",
+                                                        "SOS",
+                                                        "SPL",
+                                                        "SRD",
+                                                        "STD",
+                                                        "SVC",
+                                                        "SYP",
+                                                        "SZL",
+                                                        "THB",
+                                                        "TJS",
+                                                        "TMT",
+                                                        "TND",
+                                                        "TOP",
+                                                        "TRY",
+                                                        "TTD",
+                                                        "TVD",
+                                                        "TWD",
+                                                        "TZS",
+                                                        "UAH",
+                                                        "UGX",
+                                                        "USD",
+                                                        "UYU",
+                                                        "UZS",
+                                                        "VEF",
+                                                        "VND",
+                                                        "VUV",
+                                                        "WST",
+                                                        "XAF",
+                                                        "XCD",
+                                                        "XDR",
+                                                        "XOF",
+                                                        "XPF",
+                                                        "XTS",
+                                                        "XXX",
+                                                        "YER",
+                                                        "ZAR",
+                                                        "ZMW",
+                                                        "ZWD"
+                                                      ]
                                                     },
                                                     {
                                                       "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -18258,9 +22103,176 @@
                                                       {
                                                         "title": "ActiveOrHistoricCurrencyCode",
                                                         "type": "string",
-                                                        "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                        "pattern": "^[A-Z]{3,3}$",
-                                                        "example": "USD"
+                                                        "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                        "example": "USD",
+                                                        "minLength": 3,
+                                                        "maxLength": 3,
+                                                        "enum": [
+                                                          "AED",
+                                                          "AFN",
+                                                          "ALL",
+                                                          "AMD",
+                                                          "ANG",
+                                                          "AOA",
+                                                          "ARS",
+                                                          "AUD",
+                                                          "AWG",
+                                                          "AZN",
+                                                          "BAM",
+                                                          "BBD",
+                                                          "BDT",
+                                                          "BGN",
+                                                          "BHD",
+                                                          "BIF",
+                                                          "BMD",
+                                                          "BND",
+                                                          "BOB",
+                                                          "BRL",
+                                                          "BSD",
+                                                          "BTN",
+                                                          "BWP",
+                                                          "BYN",
+                                                          "BZD",
+                                                          "CAD",
+                                                          "CDF",
+                                                          "CHF",
+                                                          "CLP",
+                                                          "CNY",
+                                                          "COP",
+                                                          "CRC",
+                                                          "CUC",
+                                                          "CUP",
+                                                          "CVE",
+                                                          "CZK",
+                                                          "DJF",
+                                                          "DKK",
+                                                          "DOP",
+                                                          "DZD",
+                                                          "EGP",
+                                                          "ERN",
+                                                          "ETB",
+                                                          "EUR",
+                                                          "FJD",
+                                                          "FKP",
+                                                          "GBP",
+                                                          "GEL",
+                                                          "GGP",
+                                                          "GHS",
+                                                          "GIP",
+                                                          "GMD",
+                                                          "GNF",
+                                                          "GTQ",
+                                                          "GYD",
+                                                          "HKD",
+                                                          "HNL",
+                                                          "HRK",
+                                                          "HTG",
+                                                          "HUF",
+                                                          "IDR",
+                                                          "ILS",
+                                                          "IMP",
+                                                          "INR",
+                                                          "IQD",
+                                                          "IRR",
+                                                          "ISK",
+                                                          "JEP",
+                                                          "JMD",
+                                                          "JOD",
+                                                          "JPY",
+                                                          "KES",
+                                                          "KGS",
+                                                          "KHR",
+                                                          "KMF",
+                                                          "KPW",
+                                                          "KRW",
+                                                          "KWD",
+                                                          "KYD",
+                                                          "KZT",
+                                                          "LAK",
+                                                          "LBP",
+                                                          "LKR",
+                                                          "LRD",
+                                                          "LSL",
+                                                          "LYD",
+                                                          "MAD",
+                                                          "MDL",
+                                                          "MGA",
+                                                          "MKD",
+                                                          "MMK",
+                                                          "MNT",
+                                                          "MOP",
+                                                          "MRO",
+                                                          "MUR",
+                                                          "MVR",
+                                                          "MWK",
+                                                          "MXN",
+                                                          "MYR",
+                                                          "MZN",
+                                                          "NAD",
+                                                          "NGN",
+                                                          "NIO",
+                                                          "NOK",
+                                                          "NPR",
+                                                          "NZD",
+                                                          "OMR",
+                                                          "PAB",
+                                                          "PEN",
+                                                          "PGK",
+                                                          "PHP",
+                                                          "PKR",
+                                                          "PLN",
+                                                          "PYG",
+                                                          "QAR",
+                                                          "RON",
+                                                          "RSD",
+                                                          "RUB",
+                                                          "RWF",
+                                                          "SAR",
+                                                          "SBD",
+                                                          "SCR",
+                                                          "SDG",
+                                                          "SEK",
+                                                          "SGD",
+                                                          "SHP",
+                                                          "SLL",
+                                                          "SOS",
+                                                          "SPL",
+                                                          "SRD",
+                                                          "STD",
+                                                          "SVC",
+                                                          "SYP",
+                                                          "SZL",
+                                                          "THB",
+                                                          "TJS",
+                                                          "TMT",
+                                                          "TND",
+                                                          "TOP",
+                                                          "TRY",
+                                                          "TTD",
+                                                          "TVD",
+                                                          "TWD",
+                                                          "TZS",
+                                                          "UAH",
+                                                          "UGX",
+                                                          "USD",
+                                                          "UYU",
+                                                          "UZS",
+                                                          "VEF",
+                                                          "VND",
+                                                          "VUV",
+                                                          "WST",
+                                                          "XAF",
+                                                          "XCD",
+                                                          "XDR",
+                                                          "XOF",
+                                                          "XPF",
+                                                          "XTS",
+                                                          "XXX",
+                                                          "YER",
+                                                          "ZAR",
+                                                          "ZMW",
+                                                          "ZWD"
+                                                        ]
                                                       },
                                                       {
                                                         "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -18457,9 +22469,10 @@
                 "allOf": [
                   {
                     "title": "Exact32HexBinaryText",
-                    "description": "Specifies a hexadecimal string with a length of 32 characters.\n",
+                    "description": "Specifies a hexadecimal string.\n\nNOTE: This pattern is not the original ISO20022 specification.\n",
                     "type": "string",
-                    "example": "1234567890ABCDEF1234567890ABCDEF"
+                    "pattern": "^[A-Za-z0-9-_]{43}$",
+                    "maxLength": 48
                   },
                   {
                     "description": "SHA-256 signature of the terms\n"
@@ -18604,45 +22617,39 @@
               "InstrId": {
                 "allOf": [
                   {
-                    "title": "Max35Text",
-                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                    "title": "ULIDIdentifier",
                     "type": "string",
-                    "minLength": 1,
-                    "maxLength": 35,
-                    "example": 1.234567890123457e+34
+                    "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                    "example": "01AN4Z07BY79KA1307SR9X4MV3"
                   },
                   {
-                    "description": "InstructionIdentification (FSPIOP equivalent: transactionRequestId)\n\nDefinition: Unique identification, as assigned by an instructing party for an instructed party, to\nunambiguously identify the instruction.\n\nUsage: The instruction identification is a point to point reference that can be used between the\ninstructing party and the instructed party to refer to the individual instruction. It can be included in\nseveral messages related to the instruction.\n"
+                    "description": "InstructionIdentification (FSPIOP equivalent: transactionRequestId)\n\nDefinition: Unique identification, as assigned by an instructing party for an instructed party, to\nunambiguously identify the instruction.\n\nUsage: The instruction identification is a point to point reference that can be used between the\ninstructing party and the instructed party to refer to the individual instruction. It can be included in\nseveral messages related to the instruction.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                   }
                 ]
               },
               "EndToEndId": {
                 "allOf": [
                   {
-                    "title": "Max35Text",
-                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                    "title": "ULIDIdentifier",
                     "type": "string",
-                    "minLength": 1,
-                    "maxLength": 35,
-                    "example": 1.234567890123457e+34
+                    "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                    "example": "01AN4Z07BY79KA1307SR9X4MV3"
                   },
                   {
-                    "description": "EndToEndIdentification (FSPIOP equivalent: transactionId)\n\nDefinition: Unique identification, as assigned by the initiating party, to unambiguously identify the\ntransaction. This identification is passed on, unchanged, throughout the entire end-to-end chain.\n\nUsage: The end-to-end identification can be used for reconciliation or to link tasks relating to the\ntransaction. It can be included in several messages related to the transaction.\n\nUsage: In case there are technical limitations to pass on multiple references, the end-to-end\nidentification must be passed on throughout the entire end-to-end chain.\n"
+                    "description": "EndToEndIdentification (FSPIOP equivalent: transactionId)\n\nDefinition: Unique identification, as assigned by the initiating party, to unambiguously identify the\ntransaction. This identification is passed on, unchanged, throughout the entire end-to-end chain.\n\nUsage: The end-to-end identification can be used for reconciliation or to link tasks relating to the\ntransaction. It can be included in several messages related to the transaction.\n\nUsage: In case there are technical limitations to pass on multiple references, the end-to-end\nidentification must be passed on throughout the entire end-to-end chain.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                   }
                 ]
               },
               "TxId": {
                 "allOf": [
                   {
-                    "title": "Max35Text",
-                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                    "title": "ULIDIdentifier",
                     "type": "string",
-                    "minLength": 1,
-                    "maxLength": 35,
-                    "example": 1.234567890123457e+34
+                    "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                    "example": "01AN4Z07BY79KA1307SR9X4MV3"
                   },
                   {
-                    "description": "TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)\n\nDefinition: Unique identification, as assigned by the first instructing agent, to unambiguously identify the\ntransaction that is passed on, unchanged, throughout the entire interbank chain.\n\nUsage: The transaction identification can be used for reconciliation, tracking or to link tasks relating to\nthe transaction on the interbank level.\n\nUsage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.\n"
+                    "description": "TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)\n\nDefinition: Unique identification, as assigned by the first instructing agent, to unambiguously identify the\ntransaction that is passed on, unchanged, throughout the entire interbank chain.\n\nUsage: The transaction identification can be used for reconciliation, tracking or to link tasks relating to\nthe transaction on the interbank level.\n\nUsage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                   }
                 ]
               },
@@ -18953,9 +22960,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -23008,9 +27182,10064 @@
                   {
                     "title": "ActiveCurrencyCode",
                     "type": "string",
-                    "pattern": "^[A-Z]{3,3}$",
-                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".",
-                    "example": "USD"
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
+                  },
+                  {
+                    "description": "Currency\nIdentification of the currency in which the account is held.\n"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "ActiveCurrencyAndAmount",
+              "Ccy"
+            ],
+            "example": {
+              "ActiveCurrencyAndAmount": 123.45,
+              "Ccy": "USD"
+            }
+          },
+          {
+            "description": "InterbankSettlementAmount\nAmount of money moved between the instructing agent and the instructed agent.\n"
+          }
+        ]
+      },
+      "Dbtr": {
+        "allOf": [
+          {
+            "title": "BranchAndFinancialInstitutionIdentification8",
+            "type": "object",
+            "description": "Unique and unambiguous identification of a financial institution or a branch of a financial institution.\n",
+            "properties": {
+              "FinInstnId": {
+                "allOf": [
+                  {
+                    "title": "FinancialInstitutionIdentification23",
+                    "type": "object",
+                    "description": "Information used to identify a financial institution.\n",
+                    "properties": {
+                      "BICFI": {
+                        "allOf": [
+                          {
+                            "title": "BICFIDec2014Identifier",
+                            "type": "string",
+                            "description": "Code allocated to a financial institution by the ISO 9362 Registration\n\nAuthority as described in ISO 9362: 2014\n\n- \"Banking - Banking telecommunication messages - Business identifier code (BIC)\".\n",
+                            "pattern": "^[A-Z0-9]{4,4}[A-Z]{2,2}[A-Z0-9]{2,2}([A-Z0-9]{3,3}){0,1}$",
+                            "example": "J5BMVH7D"
+                          },
+                          {
+                            "description": "BICFI\nCode allocated to a financial institution by the ISO 9362 Registration Authority as described in ISO 9362 \"Banking - Banking telecommunication messages - Business identifier code (BIC)\"\n"
+                          }
+                        ]
+                      },
+                      "ClrSysMmbId": {
+                        "allOf": [
+                          {
+                            "title": "ClearingSystemMemberIdentification2",
+                            "description": "Unique identification, as assigned by a clearing system, to unambiguously identify a member of the clearing system.\n",
+                            "type": "object",
+                            "properties": {
+                              "ClrSysId": {
+                                "allOf": [
+                                  {
+                                    "title": "ClearingSystemIdentification2Choice",
+                                    "description": "Specifies the clearing system identification.\n",
+                                    "type": "object",
+                                    "anyOf": [
+                                      {
+                                        "properties": {
+                                          "Cd": {
+                                            "allOf": [
+                                              {
+                                                "title": "ExternalClearingSystemIdentification1Code",
+                                                "description": "Specifies the external clearing system identification code.\n",
+                                                "type": "string",
+                                                "minLength": 1,
+                                                "maxLength": 5,
+                                                "example": 12345
+                                              },
+                                              {
+                                                "description": "Code\nClearing system identification code, as published in an external list.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "required": [
+                                          "Cd"
+                                        ]
+                                      },
+                                      {
+                                        "properties": {
+                                          "Prtry": {
+                                            "allOf": [
+                                              {
+                                                "title": "Max35Text",
+                                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                "type": "string",
+                                                "minLength": 1,
+                                                "maxLength": 35,
+                                                "example": 1.234567890123457e+34
+                                              },
+                                              {
+                                                "description": "Proprietary\nProprietary identification of the clearing system.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "required": [
+                                          "Prtry"
+                                        ]
+                                      }
+                                    ],
+                                    "example": {
+                                      "Cd": "CHIPS"
+                                    }
+                                  },
+                                  {
+                                    "description": "ClearingSystemIdentification\nSpecification of a pre-agreed offering between clearing agents or the channel through which the payment instruction is processed.\n"
+                                  }
+                                ]
+                              },
+                              "MmbId": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "MemberIdentification\nIdentification of a member of a clearing system.\n"
+                                  }
+                                ]
+                              }
+                            },
+                            "required": [
+                              "MmbId"
+                            ],
+                            "example": {
+                              "ClrSysId": {
+                                "Cd": "CHQB"
+                              },
+                              "MmbId": 123456789
+                            }
+                          },
+                          {
+                            "description": "ClearingSystemMemberIdentification\nInformation used to identify a member within a clearing system\n"
+                          }
+                        ]
+                      },
+                      "LEI": {
+                        "allOf": [
+                          {
+                            "title": "LEIIdentifier",
+                            "description": "Legal Entity Identifier is a code allocated to a party as described in ISO 17442 \"Financial Services - Legal Entity Identifier (LEI)\". ^([0-9A-Z]{18,18}[0-9]{2,2})$\n",
+                            "type": "string",
+                            "pattern": "^[A-Z0-9]{18,18}[0-9]{2,2}$",
+                            "example": "529900T8BM49AURSDO55"
+                          },
+                          {
+                            "description": "LEI\nLegal entity identifier of the financial institution.\n"
+                          }
+                        ]
+                      },
+                      "Nm": {
+                        "allOf": [
+                          {
+                            "title": "Max140Text",
+                            "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 140,
+                            "example": 12345
+                          },
+                          {
+                            "description": "Name\nName by which an agent is known and which is usually used to identify that agent\n"
+                          }
+                        ]
+                      },
+                      "PstlAdr": {
+                        "allOf": [
+                          {
+                            "title": "PostalAddress24",
+                            "type": "object",
+                            "description": "Information that locates and identifies a specific address, as defined by postal services.\n",
+                            "properties": {
+                              "AdrTp": {
+                                "title": "AddressType3Choice",
+                                "type": "object",
+                                "description": "Choice of formats for the type of address.\n",
+                                "anyOf": [
+                                  {
+                                    "properties": {
+                                      "Cd": {
+                                        "allOf": [
+                                          {
+                                            "description": "AddressType2Code\nSpecifies the type of address.\nADDR Address\nPBOX PostBox\nHOME Home\nBIZZ Business\nMLTO MailingTo\nDLVY Delivery\n",
+                                            "enum": [
+                                              "ADDR",
+                                              "PBOX",
+                                              "HOME",
+                                              "BIZZ",
+                                              "MLTO",
+                                              "DLVY"
+                                            ],
+                                            "type": "string",
+                                            "example": "ADDR"
+                                          },
+                                          {
+                                            "description": "Code\nType of address expressed as a code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Cd"
+                                    ]
+                                  },
+                                  {
+                                    "properties": {
+                                      "Prtry": {
+                                        "allOf": [
+                                          {
+                                            "title": "GenericIdentification30",
+                                            "type": "object",
+                                            "description": "Generic scheme identification for a party.\n",
+                                            "properties": {
+                                              "Id": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Exact4AlphaNumericText",
+                                                    "description": "Specifies an alphanumeric string with a length of 4 characters.\n",
+                                                    "type": "string",
+                                                    "pattern": "^[a-zA-Z0-9]{4}$",
+                                                    "example": 1234
+                                                  },
+                                                  {
+                                                    "description": "Identification\nProprietary information, often a code, issued by the data source scheme issuer.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "Issr": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "Issuer\nEntity that assigns the identification.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "SchmeNm": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "SchemeName\nShort textual description of the scheme.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Id",
+                                              "Issr"
+                                            ],
+                                            "example": {
+                                              "Id": 1234,
+                                              "Issr": "BIC",
+                                              "SchmeNm": "BICFI"
+                                            }
+                                          },
+                                          {
+                                            "description": "Proprietary\nType of address expressed as a proprietary code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Prtry"
+                                    ]
+                                  }
+                                ],
+                                "example": {
+                                  "Cd": "ADDR"
+                                }
+                              },
+                              "Dept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "SubDept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "StrtNm": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "BldgNb": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "BldgNm": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "Flr": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "PstBx": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "Room": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "PstCd": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "TwnNm": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "TwnLctnNm": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "DstrctNm": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "CtrySubDvsn": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "Ctry": {
+                                "title": "CountryCode",
+                                "type": "string",
+                                "pattern": "^[A-Z]{2,2}$",
+                                "example": "US",
+                                "description": "Code to identify a country, a dependency, or another area of particular geopolitical interest, on the basis of country names obtained from the United Nations (ISO 3166, Alpha-2 code).\n"
+                              },
+                              "AdrLine": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              }
+                            },
+                            "example": {
+                              "AdrTp": "ADDR",
+                              "Dept": "Dept",
+                              "SubDept": "SubDept",
+                              "StrtNm": "StrtNm",
+                              "BldgNb": "BldgNb",
+                              "BldgNm": "BldgNm",
+                              "Flr": "Flr",
+                              "PstBx": "PstBx",
+                              "Room": "Room",
+                              "PstCd": "PstCd",
+                              "TwnNm": "TwnNm",
+                              "TwnLctnNm": "TwnLctnNm",
+                              "DstrctNm": "DstrctNm",
+                              "CtrySubDvsn": "CtrySubDvsn",
+                              "Ctry": "Ctry",
+                              "AdrLine": "AdrLine"
+                            }
+                          },
+                          {
+                            "description": "PostalAddress\nInformation that locates and identifies a specific address, as defined by postal services.\n"
+                          }
+                        ]
+                      },
+                      "Othr": {
+                        "allOf": [
+                          {
+                            "title": "GenericFinancialIdentification1",
+                            "type": "object",
+                            "description": "GenericFinancialIdentification\nUnique and unambiguous identification of a person, which is used to refer to a person in a financial context.\n",
+                            "properties": {
+                              "Id": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "Identification\nUnique and unambiguous identification of a person.\n"
+                                  }
+                                ]
+                              },
+                              "SchmeNm": {
+                                "allOf": [
+                                  {
+                                    "title": "FinancialIdentificationSchemeName1Choice",
+                                    "type": "object",
+                                    "description": "Specifies the name of the identification scheme.\n",
+                                    "anyOf": [
+                                      {
+                                        "properties": {
+                                          "Cd": {
+                                            "allOf": [
+                                              {
+                                                "title": "ExternalFinancialInstitutionIdentification1Code",
+                                                "description": "Specifies the external financial institution identification code.",
+                                                "type": "string",
+                                                "minLength": 1,
+                                                "maxLength": 4,
+                                                "example": 1234
+                                              },
+                                              {
+                                                "description": "Code\nName of the identification scheme, in a coded form as published in an external list.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "required": [
+                                          "Cd"
+                                        ]
+                                      },
+                                      {
+                                        "properties": {
+                                          "Prtry": {
+                                            "allOf": [
+                                              {
+                                                "title": "Max35Text",
+                                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                "type": "string",
+                                                "minLength": 1,
+                                                "maxLength": 35,
+                                                "example": 1.234567890123457e+34
+                                              },
+                                              {
+                                                "description": "Proprietary\nName of the identification scheme, in a free text form.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "required": [
+                                          "Prtry"
+                                        ]
+                                      }
+                                    ],
+                                    "example": {
+                                      "Cd": "BIC"
+                                    }
+                                  },
+                                  {
+                                    "description": "SchemeName\nName of the identification scheme.\n"
+                                  }
+                                ]
+                              },
+                              "Issr": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "Issuer\nEntity that assigns the identification.\n"
+                                  }
+                                ]
+                              }
+                            },
+                            "required": [
+                              "Id"
+                            ],
+                            "example": {
+                              "Id": 123,
+                              "SchmeNm": {
+                                "Cd": "IBAN"
+                              },
+                              "Issr": "BIC"
+                            }
+                          },
+                          {
+                            "description": "Other\nUnique identification of an agent, as assigned by an institution, using an identification scheme.\n"
+                          }
+                        ]
+                      }
+                    },
+                    "required": [],
+                    "example": {
+                      "BICFI": "J5BMVH7D",
+                      "ClrSysMmbId": {
+                        "ClrSysId": 1234,
+                        "MmbId": 123
+                      },
+                      "LEI": 123,
+                      "Nm": "Name",
+                      "PstlAdr": {
+                        "AdrTp": "ADDR",
+                        "Dept": "Department",
+                        "SubDept": "Sub department",
+                        "StrtNm": "Street name",
+                        "BldgNb": "Building number",
+                        "PstCd": "Post code",
+                        "TwnNm": "Town name",
+                        "CtrySubDvsn": "Country subdivision",
+                        "Ctry": "Country",
+                        "AdrLine": "Address line"
+                      },
+                      "Othr": {
+                        "Id": 123,
+                        "SchmeNm": {
+                          "Cd": 123,
+                          "Prtry": 123
+                        },
+                        "Issr": 123
+                      }
+                    }
+                  },
+                  {
+                    "description": "FinancialInstitutionIdentification\nUnique and unambiguous identification of a financial institution or a branch of a financial institution.\n"
+                  }
+                ]
+              },
+              "BrnchId": {
+                "allOf": [
+                  {
+                    "title": "BranchData5",
+                    "description": "Information that locates and identifies a specific branch of a financial institution.\n",
+                    "type": "object",
+                    "properties": {
+                      "Id": {
+                        "allOf": [
+                          {
+                            "title": "Max35Text",
+                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 35,
+                            "example": 1.234567890123457e+34
+                          },
+                          {
+                            "description": "Identification\nUnique and unambiguous identification of a branch of a financial institution.\n"
+                          }
+                        ]
+                      },
+                      "LEI": {
+                        "allOf": [
+                          {
+                            "title": "LEIIdentifier",
+                            "description": "Legal Entity Identifier is a code allocated to a party as described in ISO 17442 \"Financial Services - Legal Entity Identifier (LEI)\". ^([0-9A-Z]{18,18}[0-9]{2,2})$\n",
+                            "type": "string",
+                            "pattern": "^[A-Z0-9]{18,18}[0-9]{2,2}$",
+                            "example": "529900T8BM49AURSDO55"
+                          },
+                          {
+                            "description": "LEI\nLegal entity identification for the branch of the financial institution.\n"
+                          }
+                        ]
+                      },
+                      "Nm": {
+                        "allOf": [
+                          {
+                            "title": "Max140Text",
+                            "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 140,
+                            "example": 12345
+                          },
+                          {
+                            "description": "Name\nName by which an agent is known and which is usually used to identify that agent.\n"
+                          }
+                        ]
+                      },
+                      "PstlAdr": {
+                        "allOf": [
+                          {
+                            "title": "PostalAddress27",
+                            "type": "object",
+                            "description": "Information that locates and identifies a specific address, as defined by postal services.\n",
+                            "properties": {
+                              "AdrTp": {
+                                "title": "AddressType3Choice",
+                                "type": "object",
+                                "description": "Choice of formats for the type of address.\n",
+                                "anyOf": [
+                                  {
+                                    "properties": {
+                                      "Cd": {
+                                        "allOf": [
+                                          {
+                                            "description": "AddressType2Code\nSpecifies the type of address.\nADDR Address\nPBOX PostBox\nHOME Home\nBIZZ Business\nMLTO MailingTo\nDLVY Delivery\n",
+                                            "enum": [
+                                              "ADDR",
+                                              "PBOX",
+                                              "HOME",
+                                              "BIZZ",
+                                              "MLTO",
+                                              "DLVY"
+                                            ],
+                                            "type": "string",
+                                            "example": "ADDR"
+                                          },
+                                          {
+                                            "description": "Code\nType of address expressed as a code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Cd"
+                                    ]
+                                  },
+                                  {
+                                    "properties": {
+                                      "Prtry": {
+                                        "allOf": [
+                                          {
+                                            "title": "GenericIdentification30",
+                                            "type": "object",
+                                            "description": "Generic scheme identification for a party.\n",
+                                            "properties": {
+                                              "Id": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Exact4AlphaNumericText",
+                                                    "description": "Specifies an alphanumeric string with a length of 4 characters.\n",
+                                                    "type": "string",
+                                                    "pattern": "^[a-zA-Z0-9]{4}$",
+                                                    "example": 1234
+                                                  },
+                                                  {
+                                                    "description": "Identification\nProprietary information, often a code, issued by the data source scheme issuer.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "Issr": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "Issuer\nEntity that assigns the identification.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "SchmeNm": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "SchemeName\nShort textual description of the scheme.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Id",
+                                              "Issr"
+                                            ],
+                                            "example": {
+                                              "Id": 1234,
+                                              "Issr": "BIC",
+                                              "SchmeNm": "BICFI"
+                                            }
+                                          },
+                                          {
+                                            "description": "Proprietary\nType of address expressed as a proprietary code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Prtry"
+                                    ]
+                                  }
+                                ],
+                                "example": {
+                                  "Cd": "ADDR"
+                                }
+                              },
+                              "CareOf": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "Dept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "SubDept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "StrtNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "BldgNb": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "BldgNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "Flr": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "UnitNb": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "PstBx": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "Room": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "PstCd": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "TwnNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "TwnLctnNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "DstrctNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "CtrySubDvsn": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "Ctry": {
+                                "title": "CountryCode",
+                                "type": "string",
+                                "pattern": "^[A-Z]{2,2}$",
+                                "example": "US",
+                                "description": "Code to identify a country, a dependency, or another area of particular geopolitical interest, on the basis of country names obtained from the United Nations (ISO 3166, Alpha-2 code).\n"
+                              },
+                              "AdrLine": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              }
+                            },
+                            "example": {
+                              "AdrTp": "ADDR",
+                              "CareOf": "CareOf",
+                              "Dept": "Dept",
+                              "SubDept": "SubDept",
+                              "StrtNm": "StrtNm",
+                              "BldgNb": "BldgNb",
+                              "BldgNm": "BldgNm",
+                              "Flr": "Flr",
+                              "UnitNb": "UnitNb",
+                              "PstBx": "PstBx",
+                              "Room": "Room",
+                              "PstCd": "PstCd",
+                              "TwnNm": "TwnNm",
+                              "TwnLctnNm": "TwnLctnNm",
+                              "DstrctNm": "DstrctNm",
+                              "CtrySubDvsn": "CtrySubDvsn",
+                              "Ctry": "Ctry",
+                              "AdrLine": "AdrLine"
+                            }
+                          },
+                          {
+                            "description": "PostalAddress\nInformation that locates and identifies a specific address, as defined by postal services.\n"
+                          }
+                        ]
+                      }
+                    },
+                    "example": {
+                      "Id": 123,
+                      "LEI": 123,
+                      "Nm": "Name",
+                      "PstlAdr": {
+                        "AdrTp": "ADDR",
+                        "Dept": "Department",
+                        "SubDept": "Sub department",
+                        "StrtNm": "Street name",
+                        "BldgNb": "Building number"
+                      }
+                    }
+                  },
+                  {
+                    "description": "BranchIdentification\nIdentifies a specific branch of a financial institution.\n"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "FinInstnId"
+            ],
+            "example": {
+              "FinInstnId": {
+                "BICFI": "J5BMVH7D"
+              },
+              "BrnchId": {
+                "Id": 123,
+                "Nm": "Name",
+                "PstlAdr": {
+                  "AdrTp": "ADDR",
+                  "Dept": "Department",
+                  "SubDept": "Sub department",
+                  "StrtNm": "Street name",
+                  "BldgNb": "Building number",
+                  "PstCd": "Post code",
+                  "TwnNm": "Town name",
+                  "CtrySubDvsn": "Country subdivision",
+                  "Ctry": "Country",
+                  "AdrLine": "Address line"
+                }
+              }
+            }
+          },
+          {
+            "description": "Debtor\nParty that owes an amount of money to the (ultimate) creditor.\n"
+          }
+        ]
+      },
+      "DbtrAcct": {
+        "allOf": [
+          {
+            "title": "CashAccount40",
+            "type": "object",
+            "description": "Provides the details to identify an account.\n",
+            "properties": {
+              "Id": {
+                "allOf": [
+                  {
+                    "title": "AccountIdentification4Choice",
+                    "type": "object",
+                    "description": "Specifies the unique identification of an account as assigned by the account servicer.\n",
+                    "anyOf": [
+                      {
+                        "properties": {
+                          "IBAN": {
+                            "allOf": [
+                              {
+                                "title": "IBAN2007Identifier",
+                                "description": "The International Bank Account Number is a code used internationally by financial institutions to uniquely identify the account of a customer at a financial institution as described in the 2007 edition of the ISO 13616 standard \"Banking and related financial services -\nInternational Bank Account Number (IBAN)\" and replaced by the more recent edition of the standard.\n",
+                                "type": "string",
+                                "example": "FR1420041010050500013M02606",
+                                "pattern": "^[A-Z]{2,2}[0-9]{2,2}[a-zA-Z0-9]{1,30}$"
+                              },
+                              {
+                                "description": "IBAN\nInternational Bank Account Number (IBAN) - identifier used internationally by financial institutions to uniquely identify the account of a customer. Further specifications of the format and content of the IBAN can be found in the standard ISO 13616 \"Banking and related financial services - International Bank Account Number (IBAN)\" version 1997-10-01, or later revisions.\n"
+                              }
+                            ]
+                          }
+                        },
+                        "required": [
+                          "IBAN"
+                        ]
+                      },
+                      {
+                        "properties": {
+                          "Othr": {
+                            "allOf": [
+                              {
+                                "title": "GenericAccountIdentification1",
+                                "type": "object",
+                                "description": "GenericAccountIdentification\nUnique and unambiguous identification of an account, as assigned by the account servicer.\n",
+                                "properties": {
+                                  "Id": {
+                                    "allOf": [
+                                      {
+                                        "title": "Max34Text",
+                                        "description": "Specifies a character string with a maximum length of 34 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 34,
+                                        "example": 1.2345678901234568e+33
+                                      },
+                                      {
+                                        "description": "Identification\nIdentification assigned by an institution.\n"
+                                      }
+                                    ]
+                                  },
+                                  "SchmeNm": {
+                                    "allOf": [
+                                      {
+                                        "title": "AccountSchemeName1Choice",
+                                        "type": "object",
+                                        "description": "Sets of elements to identify a name of the identification scheme.\n",
+                                        "anyOf": [
+                                          {
+                                            "properties": {
+                                              "Cd": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "ExternalAccountIdentification1Code",
+                                                    "description": "Specifies the external account identification scheme name code in the format of character string with a maximum length of 4 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 4,
+                                                    "example": 1234
+                                                  },
+                                                  {
+                                                    "description": "Code\nName of the identification scheme, in a coded form as published in an external list.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Cd"
+                                            ]
+                                          },
+                                          {
+                                            "properties": {
+                                              "Prtry": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "Proprietary\nName of the identification scheme, in a free text form.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Prtry"
+                                            ]
+                                          }
+                                        ],
+                                        "example": {
+                                          "Cd": 1111
+                                        }
+                                      },
+                                      {
+                                        "description": "SchemeName\nName of the identification scheme.\n"
+                                      }
+                                    ]
+                                  },
+                                  "Issr": {
+                                    "allOf": [
+                                      {
+                                        "title": "Max35Text",
+                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 35,
+                                        "example": 1.234567890123457e+34
+                                      },
+                                      {
+                                        "description": "Issuer\nEntity that assigns the identification.\n"
+                                      }
+                                    ]
+                                  }
+                                },
+                                "required": [
+                                  "Id"
+                                ],
+                                "example": {
+                                  "Id": 123,
+                                  "SchmeNm": {
+                                    "Cd": "IBAN"
+                                  },
+                                  "Issr": "BIC"
+                                }
+                              },
+                              {
+                                "description": "Other\nUnique identification of an account, as assigned by the account servicer, using an identification scheme.\n"
+                              }
+                            ]
+                          }
+                        },
+                        "required": [
+                          "Othr"
+                        ]
+                      }
+                    ],
+                    "example": {
+                      "IBAN": "BE71096123456769"
+                    }
+                  },
+                  {
+                    "description": "Identification\nUnique and unambiguous identification for the account between the account owner and the account servicer.\n"
+                  }
+                ]
+              },
+              "Tp": {
+                "allOf": [
+                  {
+                    "title": "CashAccountType2Choice",
+                    "description": "Specifies the nature, or use of the account.\n",
+                    "type": "object",
+                    "anyOf": [
+                      {
+                        "properties": {
+                          "Cd": {
+                            "allOf": [
+                              {
+                                "title": "ExternalCashAccountType1Code",
+                                "description": "Specifies the nature, or use, of the cash account in the format of character string with a maximum length of 4 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 4,
+                                "example": 1234
+                              },
+                              {
+                                "description": "Code\nAccount type, in a coded form.\n"
+                              }
+                            ]
+                          }
+                        },
+                        "required": [
+                          "Cd"
+                        ]
+                      },
+                      {
+                        "properties": {
+                          "Prtry": {
+                            "allOf": [
+                              {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              {
+                                "description": "Proprietary\nNature or use of the account in a proprietary form.\n"
+                              }
+                            ]
+                          }
+                        },
+                        "required": [
+                          "Prtry"
+                        ]
+                      }
+                    ],
+                    "example": {
+                      "Cd": "CACC"
+                    }
+                  },
+                  {
+                    "description": "Type\nSpecifies the nature, or use of the account.\n"
+                  }
+                ]
+              },
+              "Ccy": {
+                "allOf": [
+                  {
+                    "title": "ActiveOrHistoricCurrencyCode",
+                    "type": "string",
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
+                  },
+                  {
+                    "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
+                  }
+                ]
+              },
+              "Nm": {
+                "allOf": [
+                  {
+                    "title": "Max70Text",
+                    "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                    "type": "string",
+                    "minLength": 1,
+                    "maxLength": 70,
+                    "example": 1.2345678901234567e+99
+                  },
+                  {
+                    "description": "Name\nName of the account, as assigned by the account servicing institution, in agreement with the account owner in order to provide an additional means of identification of the account.\nUsage: The account name is different from the account owner name. The account name is used in certain user communities to provide a means of identifying the account, in addition to the account owner's identity and the account number.\n"
+                  }
+                ]
+              },
+              "Prxy": {
+                "allOf": [
+                  {
+                    "title": "ProxyAccountIdentification1",
+                    "description": "Information related to a proxy identification of the account.\n",
+                    "type": "object",
+                    "properties": {
+                      "Tp": {
+                        "allOf": [
+                          {
+                            "title": "ProxyAccountType1Choice",
+                            "description": "Specifies the type of the proxy account.\n",
+                            "type": "object",
+                            "anyOf": [
+                              {
+                                "properties": {
+                                  "Cd": {
+                                    "allOf": [
+                                      {
+                                        "title": "ExternalProxyAccountType1Code",
+                                        "description": "Specifies the external proxy account type code.",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 4,
+                                        "example": 1234
+                                      },
+                                      {
+                                        "description": "Code\nProxy account type, in a coded form as published in an external list.\n"
+                                      }
+                                    ]
+                                  }
+                                },
+                                "required": [
+                                  "Cd"
+                                ]
+                              },
+                              {
+                                "properties": {
+                                  "Prtry": {
+                                    "allOf": [
+                                      {
+                                        "title": "Max35Text",
+                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 35,
+                                        "example": 1.234567890123457e+34
+                                      },
+                                      {
+                                        "description": "Proprietary\nProxy account type, in a proprietary form.\n"
+                                      }
+                                    ]
+                                  }
+                                },
+                                "required": [
+                                  "Prtry"
+                                ]
+                              }
+                            ],
+                            "example": {
+                              "Cd": "EMAIL"
+                            }
+                          },
+                          {
+                            "description": "Type\nType of the proxy identification.\n"
+                          }
+                        ]
+                      },
+                      "Id": {
+                        "allOf": [
+                          {
+                            "title": "Max2048Text",
+                            "description": "Specifies a character string with a maximum length of 2048 characters.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 2048,
+                            "example": 2048
+                          },
+                          {
+                            "description": "Identification\nIdentification used to indicate the account identification under another specified name.\n"
+                          }
+                        ]
+                      }
+                    },
+                    "required": [
+                      "Id"
+                    ],
+                    "example": {
+                      "Tp": {
+                        "Cd": "IBAN"
+                      },
+                      "Id": 123
+                    }
+                  },
+                  {
+                    "description": "Proxy\nSpecifies an alternate assumed name for the identification of the account.\n"
+                  }
+                ]
+              }
+            },
+            "example": {
+              "Id": {
+                "IBAN": "BE71096123456769"
+              },
+              "Tp": {
+                "Cd": "CACC"
+              },
+              "Ccy": "EUR",
+              "Nm": "My account",
+              "Prxy": {
+                "Id": 12345
+              }
+            }
+          },
+          {
+            "description": "DebtorAccount\nAccount used to process a payment.\n"
+          }
+        ]
+      },
+      "DbtrAgt": {
+        "allOf": [
+          {
+            "title": "BranchAndFinancialInstitutionIdentification8",
+            "type": "object",
+            "description": "Unique and unambiguous identification of a financial institution or a branch of a financial institution.\n",
+            "properties": {
+              "FinInstnId": {
+                "allOf": [
+                  {
+                    "title": "FinancialInstitutionIdentification23",
+                    "type": "object",
+                    "description": "Information used to identify a financial institution.\n",
+                    "properties": {
+                      "BICFI": {
+                        "allOf": [
+                          {
+                            "title": "BICFIDec2014Identifier",
+                            "type": "string",
+                            "description": "Code allocated to a financial institution by the ISO 9362 Registration\n\nAuthority as described in ISO 9362: 2014\n\n- \"Banking - Banking telecommunication messages - Business identifier code (BIC)\".\n",
+                            "pattern": "^[A-Z0-9]{4,4}[A-Z]{2,2}[A-Z0-9]{2,2}([A-Z0-9]{3,3}){0,1}$",
+                            "example": "J5BMVH7D"
+                          },
+                          {
+                            "description": "BICFI\nCode allocated to a financial institution by the ISO 9362 Registration Authority as described in ISO 9362 \"Banking - Banking telecommunication messages - Business identifier code (BIC)\"\n"
+                          }
+                        ]
+                      },
+                      "ClrSysMmbId": {
+                        "allOf": [
+                          {
+                            "title": "ClearingSystemMemberIdentification2",
+                            "description": "Unique identification, as assigned by a clearing system, to unambiguously identify a member of the clearing system.\n",
+                            "type": "object",
+                            "properties": {
+                              "ClrSysId": {
+                                "allOf": [
+                                  {
+                                    "title": "ClearingSystemIdentification2Choice",
+                                    "description": "Specifies the clearing system identification.\n",
+                                    "type": "object",
+                                    "anyOf": [
+                                      {
+                                        "properties": {
+                                          "Cd": {
+                                            "allOf": [
+                                              {
+                                                "title": "ExternalClearingSystemIdentification1Code",
+                                                "description": "Specifies the external clearing system identification code.\n",
+                                                "type": "string",
+                                                "minLength": 1,
+                                                "maxLength": 5,
+                                                "example": 12345
+                                              },
+                                              {
+                                                "description": "Code\nClearing system identification code, as published in an external list.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "required": [
+                                          "Cd"
+                                        ]
+                                      },
+                                      {
+                                        "properties": {
+                                          "Prtry": {
+                                            "allOf": [
+                                              {
+                                                "title": "Max35Text",
+                                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                "type": "string",
+                                                "minLength": 1,
+                                                "maxLength": 35,
+                                                "example": 1.234567890123457e+34
+                                              },
+                                              {
+                                                "description": "Proprietary\nProprietary identification of the clearing system.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "required": [
+                                          "Prtry"
+                                        ]
+                                      }
+                                    ],
+                                    "example": {
+                                      "Cd": "CHIPS"
+                                    }
+                                  },
+                                  {
+                                    "description": "ClearingSystemIdentification\nSpecification of a pre-agreed offering between clearing agents or the channel through which the payment instruction is processed.\n"
+                                  }
+                                ]
+                              },
+                              "MmbId": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "MemberIdentification\nIdentification of a member of a clearing system.\n"
+                                  }
+                                ]
+                              }
+                            },
+                            "required": [
+                              "MmbId"
+                            ],
+                            "example": {
+                              "ClrSysId": {
+                                "Cd": "CHQB"
+                              },
+                              "MmbId": 123456789
+                            }
+                          },
+                          {
+                            "description": "ClearingSystemMemberIdentification\nInformation used to identify a member within a clearing system\n"
+                          }
+                        ]
+                      },
+                      "LEI": {
+                        "allOf": [
+                          {
+                            "title": "LEIIdentifier",
+                            "description": "Legal Entity Identifier is a code allocated to a party as described in ISO 17442 \"Financial Services - Legal Entity Identifier (LEI)\". ^([0-9A-Z]{18,18}[0-9]{2,2})$\n",
+                            "type": "string",
+                            "pattern": "^[A-Z0-9]{18,18}[0-9]{2,2}$",
+                            "example": "529900T8BM49AURSDO55"
+                          },
+                          {
+                            "description": "LEI\nLegal entity identifier of the financial institution.\n"
+                          }
+                        ]
+                      },
+                      "Nm": {
+                        "allOf": [
+                          {
+                            "title": "Max140Text",
+                            "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 140,
+                            "example": 12345
+                          },
+                          {
+                            "description": "Name\nName by which an agent is known and which is usually used to identify that agent\n"
+                          }
+                        ]
+                      },
+                      "PstlAdr": {
+                        "allOf": [
+                          {
+                            "title": "PostalAddress24",
+                            "type": "object",
+                            "description": "Information that locates and identifies a specific address, as defined by postal services.\n",
+                            "properties": {
+                              "AdrTp": {
+                                "title": "AddressType3Choice",
+                                "type": "object",
+                                "description": "Choice of formats for the type of address.\n",
+                                "anyOf": [
+                                  {
+                                    "properties": {
+                                      "Cd": {
+                                        "allOf": [
+                                          {
+                                            "description": "AddressType2Code\nSpecifies the type of address.\nADDR Address\nPBOX PostBox\nHOME Home\nBIZZ Business\nMLTO MailingTo\nDLVY Delivery\n",
+                                            "enum": [
+                                              "ADDR",
+                                              "PBOX",
+                                              "HOME",
+                                              "BIZZ",
+                                              "MLTO",
+                                              "DLVY"
+                                            ],
+                                            "type": "string",
+                                            "example": "ADDR"
+                                          },
+                                          {
+                                            "description": "Code\nType of address expressed as a code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Cd"
+                                    ]
+                                  },
+                                  {
+                                    "properties": {
+                                      "Prtry": {
+                                        "allOf": [
+                                          {
+                                            "title": "GenericIdentification30",
+                                            "type": "object",
+                                            "description": "Generic scheme identification for a party.\n",
+                                            "properties": {
+                                              "Id": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Exact4AlphaNumericText",
+                                                    "description": "Specifies an alphanumeric string with a length of 4 characters.\n",
+                                                    "type": "string",
+                                                    "pattern": "^[a-zA-Z0-9]{4}$",
+                                                    "example": 1234
+                                                  },
+                                                  {
+                                                    "description": "Identification\nProprietary information, often a code, issued by the data source scheme issuer.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "Issr": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "Issuer\nEntity that assigns the identification.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "SchmeNm": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "SchemeName\nShort textual description of the scheme.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Id",
+                                              "Issr"
+                                            ],
+                                            "example": {
+                                              "Id": 1234,
+                                              "Issr": "BIC",
+                                              "SchmeNm": "BICFI"
+                                            }
+                                          },
+                                          {
+                                            "description": "Proprietary\nType of address expressed as a proprietary code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Prtry"
+                                    ]
+                                  }
+                                ],
+                                "example": {
+                                  "Cd": "ADDR"
+                                }
+                              },
+                              "Dept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "SubDept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "StrtNm": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "BldgNb": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "BldgNm": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "Flr": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "PstBx": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "Room": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "PstCd": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "TwnNm": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "TwnLctnNm": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "DstrctNm": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "CtrySubDvsn": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "Ctry": {
+                                "title": "CountryCode",
+                                "type": "string",
+                                "pattern": "^[A-Z]{2,2}$",
+                                "example": "US",
+                                "description": "Code to identify a country, a dependency, or another area of particular geopolitical interest, on the basis of country names obtained from the United Nations (ISO 3166, Alpha-2 code).\n"
+                              },
+                              "AdrLine": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              }
+                            },
+                            "example": {
+                              "AdrTp": "ADDR",
+                              "Dept": "Dept",
+                              "SubDept": "SubDept",
+                              "StrtNm": "StrtNm",
+                              "BldgNb": "BldgNb",
+                              "BldgNm": "BldgNm",
+                              "Flr": "Flr",
+                              "PstBx": "PstBx",
+                              "Room": "Room",
+                              "PstCd": "PstCd",
+                              "TwnNm": "TwnNm",
+                              "TwnLctnNm": "TwnLctnNm",
+                              "DstrctNm": "DstrctNm",
+                              "CtrySubDvsn": "CtrySubDvsn",
+                              "Ctry": "Ctry",
+                              "AdrLine": "AdrLine"
+                            }
+                          },
+                          {
+                            "description": "PostalAddress\nInformation that locates and identifies a specific address, as defined by postal services.\n"
+                          }
+                        ]
+                      },
+                      "Othr": {
+                        "allOf": [
+                          {
+                            "title": "GenericFinancialIdentification1",
+                            "type": "object",
+                            "description": "GenericFinancialIdentification\nUnique and unambiguous identification of a person, which is used to refer to a person in a financial context.\n",
+                            "properties": {
+                              "Id": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "Identification\nUnique and unambiguous identification of a person.\n"
+                                  }
+                                ]
+                              },
+                              "SchmeNm": {
+                                "allOf": [
+                                  {
+                                    "title": "FinancialIdentificationSchemeName1Choice",
+                                    "type": "object",
+                                    "description": "Specifies the name of the identification scheme.\n",
+                                    "anyOf": [
+                                      {
+                                        "properties": {
+                                          "Cd": {
+                                            "allOf": [
+                                              {
+                                                "title": "ExternalFinancialInstitutionIdentification1Code",
+                                                "description": "Specifies the external financial institution identification code.",
+                                                "type": "string",
+                                                "minLength": 1,
+                                                "maxLength": 4,
+                                                "example": 1234
+                                              },
+                                              {
+                                                "description": "Code\nName of the identification scheme, in a coded form as published in an external list.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "required": [
+                                          "Cd"
+                                        ]
+                                      },
+                                      {
+                                        "properties": {
+                                          "Prtry": {
+                                            "allOf": [
+                                              {
+                                                "title": "Max35Text",
+                                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                "type": "string",
+                                                "minLength": 1,
+                                                "maxLength": 35,
+                                                "example": 1.234567890123457e+34
+                                              },
+                                              {
+                                                "description": "Proprietary\nName of the identification scheme, in a free text form.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "required": [
+                                          "Prtry"
+                                        ]
+                                      }
+                                    ],
+                                    "example": {
+                                      "Cd": "BIC"
+                                    }
+                                  },
+                                  {
+                                    "description": "SchemeName\nName of the identification scheme.\n"
+                                  }
+                                ]
+                              },
+                              "Issr": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "Issuer\nEntity that assigns the identification.\n"
+                                  }
+                                ]
+                              }
+                            },
+                            "required": [
+                              "Id"
+                            ],
+                            "example": {
+                              "Id": 123,
+                              "SchmeNm": {
+                                "Cd": "IBAN"
+                              },
+                              "Issr": "BIC"
+                            }
+                          },
+                          {
+                            "description": "Other\nUnique identification of an agent, as assigned by an institution, using an identification scheme.\n"
+                          }
+                        ]
+                      }
+                    },
+                    "required": [],
+                    "example": {
+                      "BICFI": "J5BMVH7D",
+                      "ClrSysMmbId": {
+                        "ClrSysId": 1234,
+                        "MmbId": 123
+                      },
+                      "LEI": 123,
+                      "Nm": "Name",
+                      "PstlAdr": {
+                        "AdrTp": "ADDR",
+                        "Dept": "Department",
+                        "SubDept": "Sub department",
+                        "StrtNm": "Street name",
+                        "BldgNb": "Building number",
+                        "PstCd": "Post code",
+                        "TwnNm": "Town name",
+                        "CtrySubDvsn": "Country subdivision",
+                        "Ctry": "Country",
+                        "AdrLine": "Address line"
+                      },
+                      "Othr": {
+                        "Id": 123,
+                        "SchmeNm": {
+                          "Cd": 123,
+                          "Prtry": 123
+                        },
+                        "Issr": 123
+                      }
+                    }
+                  },
+                  {
+                    "description": "FinancialInstitutionIdentification\nUnique and unambiguous identification of a financial institution or a branch of a financial institution.\n"
+                  }
+                ]
+              },
+              "BrnchId": {
+                "allOf": [
+                  {
+                    "title": "BranchData5",
+                    "description": "Information that locates and identifies a specific branch of a financial institution.\n",
+                    "type": "object",
+                    "properties": {
+                      "Id": {
+                        "allOf": [
+                          {
+                            "title": "Max35Text",
+                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 35,
+                            "example": 1.234567890123457e+34
+                          },
+                          {
+                            "description": "Identification\nUnique and unambiguous identification of a branch of a financial institution.\n"
+                          }
+                        ]
+                      },
+                      "LEI": {
+                        "allOf": [
+                          {
+                            "title": "LEIIdentifier",
+                            "description": "Legal Entity Identifier is a code allocated to a party as described in ISO 17442 \"Financial Services - Legal Entity Identifier (LEI)\". ^([0-9A-Z]{18,18}[0-9]{2,2})$\n",
+                            "type": "string",
+                            "pattern": "^[A-Z0-9]{18,18}[0-9]{2,2}$",
+                            "example": "529900T8BM49AURSDO55"
+                          },
+                          {
+                            "description": "LEI\nLegal entity identification for the branch of the financial institution.\n"
+                          }
+                        ]
+                      },
+                      "Nm": {
+                        "allOf": [
+                          {
+                            "title": "Max140Text",
+                            "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 140,
+                            "example": 12345
+                          },
+                          {
+                            "description": "Name\nName by which an agent is known and which is usually used to identify that agent.\n"
+                          }
+                        ]
+                      },
+                      "PstlAdr": {
+                        "allOf": [
+                          {
+                            "title": "PostalAddress27",
+                            "type": "object",
+                            "description": "Information that locates and identifies a specific address, as defined by postal services.\n",
+                            "properties": {
+                              "AdrTp": {
+                                "title": "AddressType3Choice",
+                                "type": "object",
+                                "description": "Choice of formats for the type of address.\n",
+                                "anyOf": [
+                                  {
+                                    "properties": {
+                                      "Cd": {
+                                        "allOf": [
+                                          {
+                                            "description": "AddressType2Code\nSpecifies the type of address.\nADDR Address\nPBOX PostBox\nHOME Home\nBIZZ Business\nMLTO MailingTo\nDLVY Delivery\n",
+                                            "enum": [
+                                              "ADDR",
+                                              "PBOX",
+                                              "HOME",
+                                              "BIZZ",
+                                              "MLTO",
+                                              "DLVY"
+                                            ],
+                                            "type": "string",
+                                            "example": "ADDR"
+                                          },
+                                          {
+                                            "description": "Code\nType of address expressed as a code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Cd"
+                                    ]
+                                  },
+                                  {
+                                    "properties": {
+                                      "Prtry": {
+                                        "allOf": [
+                                          {
+                                            "title": "GenericIdentification30",
+                                            "type": "object",
+                                            "description": "Generic scheme identification for a party.\n",
+                                            "properties": {
+                                              "Id": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Exact4AlphaNumericText",
+                                                    "description": "Specifies an alphanumeric string with a length of 4 characters.\n",
+                                                    "type": "string",
+                                                    "pattern": "^[a-zA-Z0-9]{4}$",
+                                                    "example": 1234
+                                                  },
+                                                  {
+                                                    "description": "Identification\nProprietary information, often a code, issued by the data source scheme issuer.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "Issr": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "Issuer\nEntity that assigns the identification.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "SchmeNm": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "SchemeName\nShort textual description of the scheme.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Id",
+                                              "Issr"
+                                            ],
+                                            "example": {
+                                              "Id": 1234,
+                                              "Issr": "BIC",
+                                              "SchmeNm": "BICFI"
+                                            }
+                                          },
+                                          {
+                                            "description": "Proprietary\nType of address expressed as a proprietary code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Prtry"
+                                    ]
+                                  }
+                                ],
+                                "example": {
+                                  "Cd": "ADDR"
+                                }
+                              },
+                              "CareOf": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "Dept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "SubDept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "StrtNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "BldgNb": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "BldgNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "Flr": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "UnitNb": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "PstBx": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "Room": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "PstCd": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "TwnNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "TwnLctnNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "DstrctNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "CtrySubDvsn": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "Ctry": {
+                                "title": "CountryCode",
+                                "type": "string",
+                                "pattern": "^[A-Z]{2,2}$",
+                                "example": "US",
+                                "description": "Code to identify a country, a dependency, or another area of particular geopolitical interest, on the basis of country names obtained from the United Nations (ISO 3166, Alpha-2 code).\n"
+                              },
+                              "AdrLine": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              }
+                            },
+                            "example": {
+                              "AdrTp": "ADDR",
+                              "CareOf": "CareOf",
+                              "Dept": "Dept",
+                              "SubDept": "SubDept",
+                              "StrtNm": "StrtNm",
+                              "BldgNb": "BldgNb",
+                              "BldgNm": "BldgNm",
+                              "Flr": "Flr",
+                              "UnitNb": "UnitNb",
+                              "PstBx": "PstBx",
+                              "Room": "Room",
+                              "PstCd": "PstCd",
+                              "TwnNm": "TwnNm",
+                              "TwnLctnNm": "TwnLctnNm",
+                              "DstrctNm": "DstrctNm",
+                              "CtrySubDvsn": "CtrySubDvsn",
+                              "Ctry": "Ctry",
+                              "AdrLine": "AdrLine"
+                            }
+                          },
+                          {
+                            "description": "PostalAddress\nInformation that locates and identifies a specific address, as defined by postal services.\n"
+                          }
+                        ]
+                      }
+                    },
+                    "example": {
+                      "Id": 123,
+                      "LEI": 123,
+                      "Nm": "Name",
+                      "PstlAdr": {
+                        "AdrTp": "ADDR",
+                        "Dept": "Department",
+                        "SubDept": "Sub department",
+                        "StrtNm": "Street name",
+                        "BldgNb": "Building number"
+                      }
+                    }
+                  },
+                  {
+                    "description": "BranchIdentification\nIdentifies a specific branch of a financial institution.\n"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "FinInstnId"
+            ],
+            "example": {
+              "FinInstnId": {
+                "BICFI": "J5BMVH7D"
+              },
+              "BrnchId": {
+                "Id": 123,
+                "Nm": "Name",
+                "PstlAdr": {
+                  "AdrTp": "ADDR",
+                  "Dept": "Department",
+                  "SubDept": "Sub department",
+                  "StrtNm": "Street name",
+                  "BldgNb": "Building number",
+                  "PstCd": "Post code",
+                  "TwnNm": "Town name",
+                  "CtrySubDvsn": "Country subdivision",
+                  "Ctry": "Country",
+                  "AdrLine": "Address line"
+                }
+              }
+            }
+          },
+          {
+            "description": "DebtorAgent\nFinancial institution servicing an account for the debtor.\n"
+          }
+        ]
+      },
+      "CdtrAgt": {
+        "allOf": [
+          {
+            "title": "BranchAndFinancialInstitutionIdentification8",
+            "type": "object",
+            "description": "Unique and unambiguous identification of a financial institution or a branch of a financial institution.\n",
+            "properties": {
+              "FinInstnId": {
+                "allOf": [
+                  {
+                    "title": "FinancialInstitutionIdentification23",
+                    "type": "object",
+                    "description": "Information used to identify a financial institution.\n",
+                    "properties": {
+                      "BICFI": {
+                        "allOf": [
+                          {
+                            "title": "BICFIDec2014Identifier",
+                            "type": "string",
+                            "description": "Code allocated to a financial institution by the ISO 9362 Registration\n\nAuthority as described in ISO 9362: 2014\n\n- \"Banking - Banking telecommunication messages - Business identifier code (BIC)\".\n",
+                            "pattern": "^[A-Z0-9]{4,4}[A-Z]{2,2}[A-Z0-9]{2,2}([A-Z0-9]{3,3}){0,1}$",
+                            "example": "J5BMVH7D"
+                          },
+                          {
+                            "description": "BICFI\nCode allocated to a financial institution by the ISO 9362 Registration Authority as described in ISO 9362 \"Banking - Banking telecommunication messages - Business identifier code (BIC)\"\n"
+                          }
+                        ]
+                      },
+                      "ClrSysMmbId": {
+                        "allOf": [
+                          {
+                            "title": "ClearingSystemMemberIdentification2",
+                            "description": "Unique identification, as assigned by a clearing system, to unambiguously identify a member of the clearing system.\n",
+                            "type": "object",
+                            "properties": {
+                              "ClrSysId": {
+                                "allOf": [
+                                  {
+                                    "title": "ClearingSystemIdentification2Choice",
+                                    "description": "Specifies the clearing system identification.\n",
+                                    "type": "object",
+                                    "anyOf": [
+                                      {
+                                        "properties": {
+                                          "Cd": {
+                                            "allOf": [
+                                              {
+                                                "title": "ExternalClearingSystemIdentification1Code",
+                                                "description": "Specifies the external clearing system identification code.\n",
+                                                "type": "string",
+                                                "minLength": 1,
+                                                "maxLength": 5,
+                                                "example": 12345
+                                              },
+                                              {
+                                                "description": "Code\nClearing system identification code, as published in an external list.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "required": [
+                                          "Cd"
+                                        ]
+                                      },
+                                      {
+                                        "properties": {
+                                          "Prtry": {
+                                            "allOf": [
+                                              {
+                                                "title": "Max35Text",
+                                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                "type": "string",
+                                                "minLength": 1,
+                                                "maxLength": 35,
+                                                "example": 1.234567890123457e+34
+                                              },
+                                              {
+                                                "description": "Proprietary\nProprietary identification of the clearing system.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "required": [
+                                          "Prtry"
+                                        ]
+                                      }
+                                    ],
+                                    "example": {
+                                      "Cd": "CHIPS"
+                                    }
+                                  },
+                                  {
+                                    "description": "ClearingSystemIdentification\nSpecification of a pre-agreed offering between clearing agents or the channel through which the payment instruction is processed.\n"
+                                  }
+                                ]
+                              },
+                              "MmbId": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "MemberIdentification\nIdentification of a member of a clearing system.\n"
+                                  }
+                                ]
+                              }
+                            },
+                            "required": [
+                              "MmbId"
+                            ],
+                            "example": {
+                              "ClrSysId": {
+                                "Cd": "CHQB"
+                              },
+                              "MmbId": 123456789
+                            }
+                          },
+                          {
+                            "description": "ClearingSystemMemberIdentification\nInformation used to identify a member within a clearing system\n"
+                          }
+                        ]
+                      },
+                      "LEI": {
+                        "allOf": [
+                          {
+                            "title": "LEIIdentifier",
+                            "description": "Legal Entity Identifier is a code allocated to a party as described in ISO 17442 \"Financial Services - Legal Entity Identifier (LEI)\". ^([0-9A-Z]{18,18}[0-9]{2,2})$\n",
+                            "type": "string",
+                            "pattern": "^[A-Z0-9]{18,18}[0-9]{2,2}$",
+                            "example": "529900T8BM49AURSDO55"
+                          },
+                          {
+                            "description": "LEI\nLegal entity identifier of the financial institution.\n"
+                          }
+                        ]
+                      },
+                      "Nm": {
+                        "allOf": [
+                          {
+                            "title": "Max140Text",
+                            "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 140,
+                            "example": 12345
+                          },
+                          {
+                            "description": "Name\nName by which an agent is known and which is usually used to identify that agent\n"
+                          }
+                        ]
+                      },
+                      "PstlAdr": {
+                        "allOf": [
+                          {
+                            "title": "PostalAddress24",
+                            "type": "object",
+                            "description": "Information that locates and identifies a specific address, as defined by postal services.\n",
+                            "properties": {
+                              "AdrTp": {
+                                "title": "AddressType3Choice",
+                                "type": "object",
+                                "description": "Choice of formats for the type of address.\n",
+                                "anyOf": [
+                                  {
+                                    "properties": {
+                                      "Cd": {
+                                        "allOf": [
+                                          {
+                                            "description": "AddressType2Code\nSpecifies the type of address.\nADDR Address\nPBOX PostBox\nHOME Home\nBIZZ Business\nMLTO MailingTo\nDLVY Delivery\n",
+                                            "enum": [
+                                              "ADDR",
+                                              "PBOX",
+                                              "HOME",
+                                              "BIZZ",
+                                              "MLTO",
+                                              "DLVY"
+                                            ],
+                                            "type": "string",
+                                            "example": "ADDR"
+                                          },
+                                          {
+                                            "description": "Code\nType of address expressed as a code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Cd"
+                                    ]
+                                  },
+                                  {
+                                    "properties": {
+                                      "Prtry": {
+                                        "allOf": [
+                                          {
+                                            "title": "GenericIdentification30",
+                                            "type": "object",
+                                            "description": "Generic scheme identification for a party.\n",
+                                            "properties": {
+                                              "Id": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Exact4AlphaNumericText",
+                                                    "description": "Specifies an alphanumeric string with a length of 4 characters.\n",
+                                                    "type": "string",
+                                                    "pattern": "^[a-zA-Z0-9]{4}$",
+                                                    "example": 1234
+                                                  },
+                                                  {
+                                                    "description": "Identification\nProprietary information, often a code, issued by the data source scheme issuer.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "Issr": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "Issuer\nEntity that assigns the identification.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "SchmeNm": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "SchemeName\nShort textual description of the scheme.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Id",
+                                              "Issr"
+                                            ],
+                                            "example": {
+                                              "Id": 1234,
+                                              "Issr": "BIC",
+                                              "SchmeNm": "BICFI"
+                                            }
+                                          },
+                                          {
+                                            "description": "Proprietary\nType of address expressed as a proprietary code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Prtry"
+                                    ]
+                                  }
+                                ],
+                                "example": {
+                                  "Cd": "ADDR"
+                                }
+                              },
+                              "Dept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "SubDept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "StrtNm": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "BldgNb": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "BldgNm": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "Flr": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "PstBx": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "Room": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "PstCd": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "TwnNm": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "TwnLctnNm": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "DstrctNm": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "CtrySubDvsn": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "Ctry": {
+                                "title": "CountryCode",
+                                "type": "string",
+                                "pattern": "^[A-Z]{2,2}$",
+                                "example": "US",
+                                "description": "Code to identify a country, a dependency, or another area of particular geopolitical interest, on the basis of country names obtained from the United Nations (ISO 3166, Alpha-2 code).\n"
+                              },
+                              "AdrLine": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              }
+                            },
+                            "example": {
+                              "AdrTp": "ADDR",
+                              "Dept": "Dept",
+                              "SubDept": "SubDept",
+                              "StrtNm": "StrtNm",
+                              "BldgNb": "BldgNb",
+                              "BldgNm": "BldgNm",
+                              "Flr": "Flr",
+                              "PstBx": "PstBx",
+                              "Room": "Room",
+                              "PstCd": "PstCd",
+                              "TwnNm": "TwnNm",
+                              "TwnLctnNm": "TwnLctnNm",
+                              "DstrctNm": "DstrctNm",
+                              "CtrySubDvsn": "CtrySubDvsn",
+                              "Ctry": "Ctry",
+                              "AdrLine": "AdrLine"
+                            }
+                          },
+                          {
+                            "description": "PostalAddress\nInformation that locates and identifies a specific address, as defined by postal services.\n"
+                          }
+                        ]
+                      },
+                      "Othr": {
+                        "allOf": [
+                          {
+                            "title": "GenericFinancialIdentification1",
+                            "type": "object",
+                            "description": "GenericFinancialIdentification\nUnique and unambiguous identification of a person, which is used to refer to a person in a financial context.\n",
+                            "properties": {
+                              "Id": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "Identification\nUnique and unambiguous identification of a person.\n"
+                                  }
+                                ]
+                              },
+                              "SchmeNm": {
+                                "allOf": [
+                                  {
+                                    "title": "FinancialIdentificationSchemeName1Choice",
+                                    "type": "object",
+                                    "description": "Specifies the name of the identification scheme.\n",
+                                    "anyOf": [
+                                      {
+                                        "properties": {
+                                          "Cd": {
+                                            "allOf": [
+                                              {
+                                                "title": "ExternalFinancialInstitutionIdentification1Code",
+                                                "description": "Specifies the external financial institution identification code.",
+                                                "type": "string",
+                                                "minLength": 1,
+                                                "maxLength": 4,
+                                                "example": 1234
+                                              },
+                                              {
+                                                "description": "Code\nName of the identification scheme, in a coded form as published in an external list.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "required": [
+                                          "Cd"
+                                        ]
+                                      },
+                                      {
+                                        "properties": {
+                                          "Prtry": {
+                                            "allOf": [
+                                              {
+                                                "title": "Max35Text",
+                                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                "type": "string",
+                                                "minLength": 1,
+                                                "maxLength": 35,
+                                                "example": 1.234567890123457e+34
+                                              },
+                                              {
+                                                "description": "Proprietary\nName of the identification scheme, in a free text form.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "required": [
+                                          "Prtry"
+                                        ]
+                                      }
+                                    ],
+                                    "example": {
+                                      "Cd": "BIC"
+                                    }
+                                  },
+                                  {
+                                    "description": "SchemeName\nName of the identification scheme.\n"
+                                  }
+                                ]
+                              },
+                              "Issr": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "Issuer\nEntity that assigns the identification.\n"
+                                  }
+                                ]
+                              }
+                            },
+                            "required": [
+                              "Id"
+                            ],
+                            "example": {
+                              "Id": 123,
+                              "SchmeNm": {
+                                "Cd": "IBAN"
+                              },
+                              "Issr": "BIC"
+                            }
+                          },
+                          {
+                            "description": "Other\nUnique identification of an agent, as assigned by an institution, using an identification scheme.\n"
+                          }
+                        ]
+                      }
+                    },
+                    "required": [],
+                    "example": {
+                      "BICFI": "J5BMVH7D",
+                      "ClrSysMmbId": {
+                        "ClrSysId": 1234,
+                        "MmbId": 123
+                      },
+                      "LEI": 123,
+                      "Nm": "Name",
+                      "PstlAdr": {
+                        "AdrTp": "ADDR",
+                        "Dept": "Department",
+                        "SubDept": "Sub department",
+                        "StrtNm": "Street name",
+                        "BldgNb": "Building number",
+                        "PstCd": "Post code",
+                        "TwnNm": "Town name",
+                        "CtrySubDvsn": "Country subdivision",
+                        "Ctry": "Country",
+                        "AdrLine": "Address line"
+                      },
+                      "Othr": {
+                        "Id": 123,
+                        "SchmeNm": {
+                          "Cd": 123,
+                          "Prtry": 123
+                        },
+                        "Issr": 123
+                      }
+                    }
+                  },
+                  {
+                    "description": "FinancialInstitutionIdentification\nUnique and unambiguous identification of a financial institution or a branch of a financial institution.\n"
+                  }
+                ]
+              },
+              "BrnchId": {
+                "allOf": [
+                  {
+                    "title": "BranchData5",
+                    "description": "Information that locates and identifies a specific branch of a financial institution.\n",
+                    "type": "object",
+                    "properties": {
+                      "Id": {
+                        "allOf": [
+                          {
+                            "title": "Max35Text",
+                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 35,
+                            "example": 1.234567890123457e+34
+                          },
+                          {
+                            "description": "Identification\nUnique and unambiguous identification of a branch of a financial institution.\n"
+                          }
+                        ]
+                      },
+                      "LEI": {
+                        "allOf": [
+                          {
+                            "title": "LEIIdentifier",
+                            "description": "Legal Entity Identifier is a code allocated to a party as described in ISO 17442 \"Financial Services - Legal Entity Identifier (LEI)\". ^([0-9A-Z]{18,18}[0-9]{2,2})$\n",
+                            "type": "string",
+                            "pattern": "^[A-Z0-9]{18,18}[0-9]{2,2}$",
+                            "example": "529900T8BM49AURSDO55"
+                          },
+                          {
+                            "description": "LEI\nLegal entity identification for the branch of the financial institution.\n"
+                          }
+                        ]
+                      },
+                      "Nm": {
+                        "allOf": [
+                          {
+                            "title": "Max140Text",
+                            "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 140,
+                            "example": 12345
+                          },
+                          {
+                            "description": "Name\nName by which an agent is known and which is usually used to identify that agent.\n"
+                          }
+                        ]
+                      },
+                      "PstlAdr": {
+                        "allOf": [
+                          {
+                            "title": "PostalAddress27",
+                            "type": "object",
+                            "description": "Information that locates and identifies a specific address, as defined by postal services.\n",
+                            "properties": {
+                              "AdrTp": {
+                                "title": "AddressType3Choice",
+                                "type": "object",
+                                "description": "Choice of formats for the type of address.\n",
+                                "anyOf": [
+                                  {
+                                    "properties": {
+                                      "Cd": {
+                                        "allOf": [
+                                          {
+                                            "description": "AddressType2Code\nSpecifies the type of address.\nADDR Address\nPBOX PostBox\nHOME Home\nBIZZ Business\nMLTO MailingTo\nDLVY Delivery\n",
+                                            "enum": [
+                                              "ADDR",
+                                              "PBOX",
+                                              "HOME",
+                                              "BIZZ",
+                                              "MLTO",
+                                              "DLVY"
+                                            ],
+                                            "type": "string",
+                                            "example": "ADDR"
+                                          },
+                                          {
+                                            "description": "Code\nType of address expressed as a code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Cd"
+                                    ]
+                                  },
+                                  {
+                                    "properties": {
+                                      "Prtry": {
+                                        "allOf": [
+                                          {
+                                            "title": "GenericIdentification30",
+                                            "type": "object",
+                                            "description": "Generic scheme identification for a party.\n",
+                                            "properties": {
+                                              "Id": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Exact4AlphaNumericText",
+                                                    "description": "Specifies an alphanumeric string with a length of 4 characters.\n",
+                                                    "type": "string",
+                                                    "pattern": "^[a-zA-Z0-9]{4}$",
+                                                    "example": 1234
+                                                  },
+                                                  {
+                                                    "description": "Identification\nProprietary information, often a code, issued by the data source scheme issuer.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "Issr": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "Issuer\nEntity that assigns the identification.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "SchmeNm": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "SchemeName\nShort textual description of the scheme.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Id",
+                                              "Issr"
+                                            ],
+                                            "example": {
+                                              "Id": 1234,
+                                              "Issr": "BIC",
+                                              "SchmeNm": "BICFI"
+                                            }
+                                          },
+                                          {
+                                            "description": "Proprietary\nType of address expressed as a proprietary code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Prtry"
+                                    ]
+                                  }
+                                ],
+                                "example": {
+                                  "Cd": "ADDR"
+                                }
+                              },
+                              "CareOf": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "Dept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "SubDept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "StrtNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "BldgNb": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "BldgNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "Flr": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "UnitNb": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "PstBx": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "Room": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "PstCd": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "TwnNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "TwnLctnNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "DstrctNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "CtrySubDvsn": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "Ctry": {
+                                "title": "CountryCode",
+                                "type": "string",
+                                "pattern": "^[A-Z]{2,2}$",
+                                "example": "US",
+                                "description": "Code to identify a country, a dependency, or another area of particular geopolitical interest, on the basis of country names obtained from the United Nations (ISO 3166, Alpha-2 code).\n"
+                              },
+                              "AdrLine": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              }
+                            },
+                            "example": {
+                              "AdrTp": "ADDR",
+                              "CareOf": "CareOf",
+                              "Dept": "Dept",
+                              "SubDept": "SubDept",
+                              "StrtNm": "StrtNm",
+                              "BldgNb": "BldgNb",
+                              "BldgNm": "BldgNm",
+                              "Flr": "Flr",
+                              "UnitNb": "UnitNb",
+                              "PstBx": "PstBx",
+                              "Room": "Room",
+                              "PstCd": "PstCd",
+                              "TwnNm": "TwnNm",
+                              "TwnLctnNm": "TwnLctnNm",
+                              "DstrctNm": "DstrctNm",
+                              "CtrySubDvsn": "CtrySubDvsn",
+                              "Ctry": "Ctry",
+                              "AdrLine": "AdrLine"
+                            }
+                          },
+                          {
+                            "description": "PostalAddress\nInformation that locates and identifies a specific address, as defined by postal services.\n"
+                          }
+                        ]
+                      }
+                    },
+                    "example": {
+                      "Id": 123,
+                      "LEI": 123,
+                      "Nm": "Name",
+                      "PstlAdr": {
+                        "AdrTp": "ADDR",
+                        "Dept": "Department",
+                        "SubDept": "Sub department",
+                        "StrtNm": "Street name",
+                        "BldgNb": "Building number"
+                      }
+                    }
+                  },
+                  {
+                    "description": "BranchIdentification\nIdentifies a specific branch of a financial institution.\n"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "FinInstnId"
+            ],
+            "example": {
+              "FinInstnId": {
+                "BICFI": "J5BMVH7D"
+              },
+              "BrnchId": {
+                "Id": 123,
+                "Nm": "Name",
+                "PstlAdr": {
+                  "AdrTp": "ADDR",
+                  "Dept": "Department",
+                  "SubDept": "Sub department",
+                  "StrtNm": "Street name",
+                  "BldgNb": "Building number",
+                  "PstCd": "Post code",
+                  "TwnNm": "Town name",
+                  "CtrySubDvsn": "Country subdivision",
+                  "Ctry": "Country",
+                  "AdrLine": "Address line"
+                }
+              }
+            }
+          },
+          {
+            "description": "CreditorAgent\nFinancial institution servicing an account for the creditor.\n"
+          }
+        ]
+      },
+      "Cdtr": {
+        "allOf": [
+          {
+            "title": "BranchAndFinancialInstitutionIdentification8",
+            "type": "object",
+            "description": "Unique and unambiguous identification of a financial institution or a branch of a financial institution.\n",
+            "properties": {
+              "FinInstnId": {
+                "allOf": [
+                  {
+                    "title": "FinancialInstitutionIdentification23",
+                    "type": "object",
+                    "description": "Information used to identify a financial institution.\n",
+                    "properties": {
+                      "BICFI": {
+                        "allOf": [
+                          {
+                            "title": "BICFIDec2014Identifier",
+                            "type": "string",
+                            "description": "Code allocated to a financial institution by the ISO 9362 Registration\n\nAuthority as described in ISO 9362: 2014\n\n- \"Banking - Banking telecommunication messages - Business identifier code (BIC)\".\n",
+                            "pattern": "^[A-Z0-9]{4,4}[A-Z]{2,2}[A-Z0-9]{2,2}([A-Z0-9]{3,3}){0,1}$",
+                            "example": "J5BMVH7D"
+                          },
+                          {
+                            "description": "BICFI\nCode allocated to a financial institution by the ISO 9362 Registration Authority as described in ISO 9362 \"Banking - Banking telecommunication messages - Business identifier code (BIC)\"\n"
+                          }
+                        ]
+                      },
+                      "ClrSysMmbId": {
+                        "allOf": [
+                          {
+                            "title": "ClearingSystemMemberIdentification2",
+                            "description": "Unique identification, as assigned by a clearing system, to unambiguously identify a member of the clearing system.\n",
+                            "type": "object",
+                            "properties": {
+                              "ClrSysId": {
+                                "allOf": [
+                                  {
+                                    "title": "ClearingSystemIdentification2Choice",
+                                    "description": "Specifies the clearing system identification.\n",
+                                    "type": "object",
+                                    "anyOf": [
+                                      {
+                                        "properties": {
+                                          "Cd": {
+                                            "allOf": [
+                                              {
+                                                "title": "ExternalClearingSystemIdentification1Code",
+                                                "description": "Specifies the external clearing system identification code.\n",
+                                                "type": "string",
+                                                "minLength": 1,
+                                                "maxLength": 5,
+                                                "example": 12345
+                                              },
+                                              {
+                                                "description": "Code\nClearing system identification code, as published in an external list.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "required": [
+                                          "Cd"
+                                        ]
+                                      },
+                                      {
+                                        "properties": {
+                                          "Prtry": {
+                                            "allOf": [
+                                              {
+                                                "title": "Max35Text",
+                                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                "type": "string",
+                                                "minLength": 1,
+                                                "maxLength": 35,
+                                                "example": 1.234567890123457e+34
+                                              },
+                                              {
+                                                "description": "Proprietary\nProprietary identification of the clearing system.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "required": [
+                                          "Prtry"
+                                        ]
+                                      }
+                                    ],
+                                    "example": {
+                                      "Cd": "CHIPS"
+                                    }
+                                  },
+                                  {
+                                    "description": "ClearingSystemIdentification\nSpecification of a pre-agreed offering between clearing agents or the channel through which the payment instruction is processed.\n"
+                                  }
+                                ]
+                              },
+                              "MmbId": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "MemberIdentification\nIdentification of a member of a clearing system.\n"
+                                  }
+                                ]
+                              }
+                            },
+                            "required": [
+                              "MmbId"
+                            ],
+                            "example": {
+                              "ClrSysId": {
+                                "Cd": "CHQB"
+                              },
+                              "MmbId": 123456789
+                            }
+                          },
+                          {
+                            "description": "ClearingSystemMemberIdentification\nInformation used to identify a member within a clearing system\n"
+                          }
+                        ]
+                      },
+                      "LEI": {
+                        "allOf": [
+                          {
+                            "title": "LEIIdentifier",
+                            "description": "Legal Entity Identifier is a code allocated to a party as described in ISO 17442 \"Financial Services - Legal Entity Identifier (LEI)\". ^([0-9A-Z]{18,18}[0-9]{2,2})$\n",
+                            "type": "string",
+                            "pattern": "^[A-Z0-9]{18,18}[0-9]{2,2}$",
+                            "example": "529900T8BM49AURSDO55"
+                          },
+                          {
+                            "description": "LEI\nLegal entity identifier of the financial institution.\n"
+                          }
+                        ]
+                      },
+                      "Nm": {
+                        "allOf": [
+                          {
+                            "title": "Max140Text",
+                            "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 140,
+                            "example": 12345
+                          },
+                          {
+                            "description": "Name\nName by which an agent is known and which is usually used to identify that agent\n"
+                          }
+                        ]
+                      },
+                      "PstlAdr": {
+                        "allOf": [
+                          {
+                            "title": "PostalAddress24",
+                            "type": "object",
+                            "description": "Information that locates and identifies a specific address, as defined by postal services.\n",
+                            "properties": {
+                              "AdrTp": {
+                                "title": "AddressType3Choice",
+                                "type": "object",
+                                "description": "Choice of formats for the type of address.\n",
+                                "anyOf": [
+                                  {
+                                    "properties": {
+                                      "Cd": {
+                                        "allOf": [
+                                          {
+                                            "description": "AddressType2Code\nSpecifies the type of address.\nADDR Address\nPBOX PostBox\nHOME Home\nBIZZ Business\nMLTO MailingTo\nDLVY Delivery\n",
+                                            "enum": [
+                                              "ADDR",
+                                              "PBOX",
+                                              "HOME",
+                                              "BIZZ",
+                                              "MLTO",
+                                              "DLVY"
+                                            ],
+                                            "type": "string",
+                                            "example": "ADDR"
+                                          },
+                                          {
+                                            "description": "Code\nType of address expressed as a code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Cd"
+                                    ]
+                                  },
+                                  {
+                                    "properties": {
+                                      "Prtry": {
+                                        "allOf": [
+                                          {
+                                            "title": "GenericIdentification30",
+                                            "type": "object",
+                                            "description": "Generic scheme identification for a party.\n",
+                                            "properties": {
+                                              "Id": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Exact4AlphaNumericText",
+                                                    "description": "Specifies an alphanumeric string with a length of 4 characters.\n",
+                                                    "type": "string",
+                                                    "pattern": "^[a-zA-Z0-9]{4}$",
+                                                    "example": 1234
+                                                  },
+                                                  {
+                                                    "description": "Identification\nProprietary information, often a code, issued by the data source scheme issuer.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "Issr": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "Issuer\nEntity that assigns the identification.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "SchmeNm": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "SchemeName\nShort textual description of the scheme.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Id",
+                                              "Issr"
+                                            ],
+                                            "example": {
+                                              "Id": 1234,
+                                              "Issr": "BIC",
+                                              "SchmeNm": "BICFI"
+                                            }
+                                          },
+                                          {
+                                            "description": "Proprietary\nType of address expressed as a proprietary code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Prtry"
+                                    ]
+                                  }
+                                ],
+                                "example": {
+                                  "Cd": "ADDR"
+                                }
+                              },
+                              "Dept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "SubDept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "StrtNm": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "BldgNb": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "BldgNm": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "Flr": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "PstBx": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "Room": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "PstCd": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "TwnNm": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "TwnLctnNm": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "DstrctNm": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "CtrySubDvsn": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "Ctry": {
+                                "title": "CountryCode",
+                                "type": "string",
+                                "pattern": "^[A-Z]{2,2}$",
+                                "example": "US",
+                                "description": "Code to identify a country, a dependency, or another area of particular geopolitical interest, on the basis of country names obtained from the United Nations (ISO 3166, Alpha-2 code).\n"
+                              },
+                              "AdrLine": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              }
+                            },
+                            "example": {
+                              "AdrTp": "ADDR",
+                              "Dept": "Dept",
+                              "SubDept": "SubDept",
+                              "StrtNm": "StrtNm",
+                              "BldgNb": "BldgNb",
+                              "BldgNm": "BldgNm",
+                              "Flr": "Flr",
+                              "PstBx": "PstBx",
+                              "Room": "Room",
+                              "PstCd": "PstCd",
+                              "TwnNm": "TwnNm",
+                              "TwnLctnNm": "TwnLctnNm",
+                              "DstrctNm": "DstrctNm",
+                              "CtrySubDvsn": "CtrySubDvsn",
+                              "Ctry": "Ctry",
+                              "AdrLine": "AdrLine"
+                            }
+                          },
+                          {
+                            "description": "PostalAddress\nInformation that locates and identifies a specific address, as defined by postal services.\n"
+                          }
+                        ]
+                      },
+                      "Othr": {
+                        "allOf": [
+                          {
+                            "title": "GenericFinancialIdentification1",
+                            "type": "object",
+                            "description": "GenericFinancialIdentification\nUnique and unambiguous identification of a person, which is used to refer to a person in a financial context.\n",
+                            "properties": {
+                              "Id": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "Identification\nUnique and unambiguous identification of a person.\n"
+                                  }
+                                ]
+                              },
+                              "SchmeNm": {
+                                "allOf": [
+                                  {
+                                    "title": "FinancialIdentificationSchemeName1Choice",
+                                    "type": "object",
+                                    "description": "Specifies the name of the identification scheme.\n",
+                                    "anyOf": [
+                                      {
+                                        "properties": {
+                                          "Cd": {
+                                            "allOf": [
+                                              {
+                                                "title": "ExternalFinancialInstitutionIdentification1Code",
+                                                "description": "Specifies the external financial institution identification code.",
+                                                "type": "string",
+                                                "minLength": 1,
+                                                "maxLength": 4,
+                                                "example": 1234
+                                              },
+                                              {
+                                                "description": "Code\nName of the identification scheme, in a coded form as published in an external list.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "required": [
+                                          "Cd"
+                                        ]
+                                      },
+                                      {
+                                        "properties": {
+                                          "Prtry": {
+                                            "allOf": [
+                                              {
+                                                "title": "Max35Text",
+                                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                "type": "string",
+                                                "minLength": 1,
+                                                "maxLength": 35,
+                                                "example": 1.234567890123457e+34
+                                              },
+                                              {
+                                                "description": "Proprietary\nName of the identification scheme, in a free text form.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "required": [
+                                          "Prtry"
+                                        ]
+                                      }
+                                    ],
+                                    "example": {
+                                      "Cd": "BIC"
+                                    }
+                                  },
+                                  {
+                                    "description": "SchemeName\nName of the identification scheme.\n"
+                                  }
+                                ]
+                              },
+                              "Issr": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "Issuer\nEntity that assigns the identification.\n"
+                                  }
+                                ]
+                              }
+                            },
+                            "required": [
+                              "Id"
+                            ],
+                            "example": {
+                              "Id": 123,
+                              "SchmeNm": {
+                                "Cd": "IBAN"
+                              },
+                              "Issr": "BIC"
+                            }
+                          },
+                          {
+                            "description": "Other\nUnique identification of an agent, as assigned by an institution, using an identification scheme.\n"
+                          }
+                        ]
+                      }
+                    },
+                    "required": [],
+                    "example": {
+                      "BICFI": "J5BMVH7D",
+                      "ClrSysMmbId": {
+                        "ClrSysId": 1234,
+                        "MmbId": 123
+                      },
+                      "LEI": 123,
+                      "Nm": "Name",
+                      "PstlAdr": {
+                        "AdrTp": "ADDR",
+                        "Dept": "Department",
+                        "SubDept": "Sub department",
+                        "StrtNm": "Street name",
+                        "BldgNb": "Building number",
+                        "PstCd": "Post code",
+                        "TwnNm": "Town name",
+                        "CtrySubDvsn": "Country subdivision",
+                        "Ctry": "Country",
+                        "AdrLine": "Address line"
+                      },
+                      "Othr": {
+                        "Id": 123,
+                        "SchmeNm": {
+                          "Cd": 123,
+                          "Prtry": 123
+                        },
+                        "Issr": 123
+                      }
+                    }
+                  },
+                  {
+                    "description": "FinancialInstitutionIdentification\nUnique and unambiguous identification of a financial institution or a branch of a financial institution.\n"
+                  }
+                ]
+              },
+              "BrnchId": {
+                "allOf": [
+                  {
+                    "title": "BranchData5",
+                    "description": "Information that locates and identifies a specific branch of a financial institution.\n",
+                    "type": "object",
+                    "properties": {
+                      "Id": {
+                        "allOf": [
+                          {
+                            "title": "Max35Text",
+                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 35,
+                            "example": 1.234567890123457e+34
+                          },
+                          {
+                            "description": "Identification\nUnique and unambiguous identification of a branch of a financial institution.\n"
+                          }
+                        ]
+                      },
+                      "LEI": {
+                        "allOf": [
+                          {
+                            "title": "LEIIdentifier",
+                            "description": "Legal Entity Identifier is a code allocated to a party as described in ISO 17442 \"Financial Services - Legal Entity Identifier (LEI)\". ^([0-9A-Z]{18,18}[0-9]{2,2})$\n",
+                            "type": "string",
+                            "pattern": "^[A-Z0-9]{18,18}[0-9]{2,2}$",
+                            "example": "529900T8BM49AURSDO55"
+                          },
+                          {
+                            "description": "LEI\nLegal entity identification for the branch of the financial institution.\n"
+                          }
+                        ]
+                      },
+                      "Nm": {
+                        "allOf": [
+                          {
+                            "title": "Max140Text",
+                            "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 140,
+                            "example": 12345
+                          },
+                          {
+                            "description": "Name\nName by which an agent is known and which is usually used to identify that agent.\n"
+                          }
+                        ]
+                      },
+                      "PstlAdr": {
+                        "allOf": [
+                          {
+                            "title": "PostalAddress27",
+                            "type": "object",
+                            "description": "Information that locates and identifies a specific address, as defined by postal services.\n",
+                            "properties": {
+                              "AdrTp": {
+                                "title": "AddressType3Choice",
+                                "type": "object",
+                                "description": "Choice of formats for the type of address.\n",
+                                "anyOf": [
+                                  {
+                                    "properties": {
+                                      "Cd": {
+                                        "allOf": [
+                                          {
+                                            "description": "AddressType2Code\nSpecifies the type of address.\nADDR Address\nPBOX PostBox\nHOME Home\nBIZZ Business\nMLTO MailingTo\nDLVY Delivery\n",
+                                            "enum": [
+                                              "ADDR",
+                                              "PBOX",
+                                              "HOME",
+                                              "BIZZ",
+                                              "MLTO",
+                                              "DLVY"
+                                            ],
+                                            "type": "string",
+                                            "example": "ADDR"
+                                          },
+                                          {
+                                            "description": "Code\nType of address expressed as a code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Cd"
+                                    ]
+                                  },
+                                  {
+                                    "properties": {
+                                      "Prtry": {
+                                        "allOf": [
+                                          {
+                                            "title": "GenericIdentification30",
+                                            "type": "object",
+                                            "description": "Generic scheme identification for a party.\n",
+                                            "properties": {
+                                              "Id": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Exact4AlphaNumericText",
+                                                    "description": "Specifies an alphanumeric string with a length of 4 characters.\n",
+                                                    "type": "string",
+                                                    "pattern": "^[a-zA-Z0-9]{4}$",
+                                                    "example": 1234
+                                                  },
+                                                  {
+                                                    "description": "Identification\nProprietary information, often a code, issued by the data source scheme issuer.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "Issr": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "Issuer\nEntity that assigns the identification.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "SchmeNm": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "SchemeName\nShort textual description of the scheme.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Id",
+                                              "Issr"
+                                            ],
+                                            "example": {
+                                              "Id": 1234,
+                                              "Issr": "BIC",
+                                              "SchmeNm": "BICFI"
+                                            }
+                                          },
+                                          {
+                                            "description": "Proprietary\nType of address expressed as a proprietary code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Prtry"
+                                    ]
+                                  }
+                                ],
+                                "example": {
+                                  "Cd": "ADDR"
+                                }
+                              },
+                              "CareOf": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "Dept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "SubDept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "StrtNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "BldgNb": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "BldgNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "Flr": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "UnitNb": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "PstBx": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "Room": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "PstCd": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "TwnNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "TwnLctnNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "DstrctNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "CtrySubDvsn": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "Ctry": {
+                                "title": "CountryCode",
+                                "type": "string",
+                                "pattern": "^[A-Z]{2,2}$",
+                                "example": "US",
+                                "description": "Code to identify a country, a dependency, or another area of particular geopolitical interest, on the basis of country names obtained from the United Nations (ISO 3166, Alpha-2 code).\n"
+                              },
+                              "AdrLine": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              }
+                            },
+                            "example": {
+                              "AdrTp": "ADDR",
+                              "CareOf": "CareOf",
+                              "Dept": "Dept",
+                              "SubDept": "SubDept",
+                              "StrtNm": "StrtNm",
+                              "BldgNb": "BldgNb",
+                              "BldgNm": "BldgNm",
+                              "Flr": "Flr",
+                              "UnitNb": "UnitNb",
+                              "PstBx": "PstBx",
+                              "Room": "Room",
+                              "PstCd": "PstCd",
+                              "TwnNm": "TwnNm",
+                              "TwnLctnNm": "TwnLctnNm",
+                              "DstrctNm": "DstrctNm",
+                              "CtrySubDvsn": "CtrySubDvsn",
+                              "Ctry": "Ctry",
+                              "AdrLine": "AdrLine"
+                            }
+                          },
+                          {
+                            "description": "PostalAddress\nInformation that locates and identifies a specific address, as defined by postal services.\n"
+                          }
+                        ]
+                      }
+                    },
+                    "example": {
+                      "Id": 123,
+                      "LEI": 123,
+                      "Nm": "Name",
+                      "PstlAdr": {
+                        "AdrTp": "ADDR",
+                        "Dept": "Department",
+                        "SubDept": "Sub department",
+                        "StrtNm": "Street name",
+                        "BldgNb": "Building number"
+                      }
+                    }
+                  },
+                  {
+                    "description": "BranchIdentification\nIdentifies a specific branch of a financial institution.\n"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "FinInstnId"
+            ],
+            "example": {
+              "FinInstnId": {
+                "BICFI": "J5BMVH7D"
+              },
+              "BrnchId": {
+                "Id": 123,
+                "Nm": "Name",
+                "PstlAdr": {
+                  "AdrTp": "ADDR",
+                  "Dept": "Department",
+                  "SubDept": "Sub department",
+                  "StrtNm": "Street name",
+                  "BldgNb": "Building number",
+                  "PstCd": "Post code",
+                  "TwnNm": "Town name",
+                  "CtrySubDvsn": "Country subdivision",
+                  "Ctry": "Country",
+                  "AdrLine": "Address line"
+                }
+              }
+            }
+          },
+          {
+            "description": "Creditor\nParty to which an amount of money is due.\n"
+          }
+        ]
+      },
+      "CdtrAcct": {
+        "allOf": [
+          {
+            "title": "CashAccount40",
+            "type": "object",
+            "description": "Provides the details to identify an account.\n",
+            "properties": {
+              "Id": {
+                "allOf": [
+                  {
+                    "title": "AccountIdentification4Choice",
+                    "type": "object",
+                    "description": "Specifies the unique identification of an account as assigned by the account servicer.\n",
+                    "anyOf": [
+                      {
+                        "properties": {
+                          "IBAN": {
+                            "allOf": [
+                              {
+                                "title": "IBAN2007Identifier",
+                                "description": "The International Bank Account Number is a code used internationally by financial institutions to uniquely identify the account of a customer at a financial institution as described in the 2007 edition of the ISO 13616 standard \"Banking and related financial services -\nInternational Bank Account Number (IBAN)\" and replaced by the more recent edition of the standard.\n",
+                                "type": "string",
+                                "example": "FR1420041010050500013M02606",
+                                "pattern": "^[A-Z]{2,2}[0-9]{2,2}[a-zA-Z0-9]{1,30}$"
+                              },
+                              {
+                                "description": "IBAN\nInternational Bank Account Number (IBAN) - identifier used internationally by financial institutions to uniquely identify the account of a customer. Further specifications of the format and content of the IBAN can be found in the standard ISO 13616 \"Banking and related financial services - International Bank Account Number (IBAN)\" version 1997-10-01, or later revisions.\n"
+                              }
+                            ]
+                          }
+                        },
+                        "required": [
+                          "IBAN"
+                        ]
+                      },
+                      {
+                        "properties": {
+                          "Othr": {
+                            "allOf": [
+                              {
+                                "title": "GenericAccountIdentification1",
+                                "type": "object",
+                                "description": "GenericAccountIdentification\nUnique and unambiguous identification of an account, as assigned by the account servicer.\n",
+                                "properties": {
+                                  "Id": {
+                                    "allOf": [
+                                      {
+                                        "title": "Max34Text",
+                                        "description": "Specifies a character string with a maximum length of 34 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 34,
+                                        "example": 1.2345678901234568e+33
+                                      },
+                                      {
+                                        "description": "Identification\nIdentification assigned by an institution.\n"
+                                      }
+                                    ]
+                                  },
+                                  "SchmeNm": {
+                                    "allOf": [
+                                      {
+                                        "title": "AccountSchemeName1Choice",
+                                        "type": "object",
+                                        "description": "Sets of elements to identify a name of the identification scheme.\n",
+                                        "anyOf": [
+                                          {
+                                            "properties": {
+                                              "Cd": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "ExternalAccountIdentification1Code",
+                                                    "description": "Specifies the external account identification scheme name code in the format of character string with a maximum length of 4 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 4,
+                                                    "example": 1234
+                                                  },
+                                                  {
+                                                    "description": "Code\nName of the identification scheme, in a coded form as published in an external list.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Cd"
+                                            ]
+                                          },
+                                          {
+                                            "properties": {
+                                              "Prtry": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "Proprietary\nName of the identification scheme, in a free text form.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Prtry"
+                                            ]
+                                          }
+                                        ],
+                                        "example": {
+                                          "Cd": 1111
+                                        }
+                                      },
+                                      {
+                                        "description": "SchemeName\nName of the identification scheme.\n"
+                                      }
+                                    ]
+                                  },
+                                  "Issr": {
+                                    "allOf": [
+                                      {
+                                        "title": "Max35Text",
+                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 35,
+                                        "example": 1.234567890123457e+34
+                                      },
+                                      {
+                                        "description": "Issuer\nEntity that assigns the identification.\n"
+                                      }
+                                    ]
+                                  }
+                                },
+                                "required": [
+                                  "Id"
+                                ],
+                                "example": {
+                                  "Id": 123,
+                                  "SchmeNm": {
+                                    "Cd": "IBAN"
+                                  },
+                                  "Issr": "BIC"
+                                }
+                              },
+                              {
+                                "description": "Other\nUnique identification of an account, as assigned by the account servicer, using an identification scheme.\n"
+                              }
+                            ]
+                          }
+                        },
+                        "required": [
+                          "Othr"
+                        ]
+                      }
+                    ],
+                    "example": {
+                      "IBAN": "BE71096123456769"
+                    }
+                  },
+                  {
+                    "description": "Identification\nUnique and unambiguous identification for the account between the account owner and the account servicer.\n"
+                  }
+                ]
+              },
+              "Tp": {
+                "allOf": [
+                  {
+                    "title": "CashAccountType2Choice",
+                    "description": "Specifies the nature, or use of the account.\n",
+                    "type": "object",
+                    "anyOf": [
+                      {
+                        "properties": {
+                          "Cd": {
+                            "allOf": [
+                              {
+                                "title": "ExternalCashAccountType1Code",
+                                "description": "Specifies the nature, or use, of the cash account in the format of character string with a maximum length of 4 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 4,
+                                "example": 1234
+                              },
+                              {
+                                "description": "Code\nAccount type, in a coded form.\n"
+                              }
+                            ]
+                          }
+                        },
+                        "required": [
+                          "Cd"
+                        ]
+                      },
+                      {
+                        "properties": {
+                          "Prtry": {
+                            "allOf": [
+                              {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              {
+                                "description": "Proprietary\nNature or use of the account in a proprietary form.\n"
+                              }
+                            ]
+                          }
+                        },
+                        "required": [
+                          "Prtry"
+                        ]
+                      }
+                    ],
+                    "example": {
+                      "Cd": "CACC"
+                    }
+                  },
+                  {
+                    "description": "Type\nSpecifies the nature, or use of the account.\n"
+                  }
+                ]
+              },
+              "Ccy": {
+                "allOf": [
+                  {
+                    "title": "ActiveOrHistoricCurrencyCode",
+                    "type": "string",
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
+                  },
+                  {
+                    "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
+                  }
+                ]
+              },
+              "Nm": {
+                "allOf": [
+                  {
+                    "title": "Max70Text",
+                    "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                    "type": "string",
+                    "minLength": 1,
+                    "maxLength": 70,
+                    "example": 1.2345678901234567e+99
+                  },
+                  {
+                    "description": "Name\nName of the account, as assigned by the account servicing institution, in agreement with the account owner in order to provide an additional means of identification of the account.\nUsage: The account name is different from the account owner name. The account name is used in certain user communities to provide a means of identifying the account, in addition to the account owner's identity and the account number.\n"
+                  }
+                ]
+              },
+              "Prxy": {
+                "allOf": [
+                  {
+                    "title": "ProxyAccountIdentification1",
+                    "description": "Information related to a proxy identification of the account.\n",
+                    "type": "object",
+                    "properties": {
+                      "Tp": {
+                        "allOf": [
+                          {
+                            "title": "ProxyAccountType1Choice",
+                            "description": "Specifies the type of the proxy account.\n",
+                            "type": "object",
+                            "anyOf": [
+                              {
+                                "properties": {
+                                  "Cd": {
+                                    "allOf": [
+                                      {
+                                        "title": "ExternalProxyAccountType1Code",
+                                        "description": "Specifies the external proxy account type code.",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 4,
+                                        "example": 1234
+                                      },
+                                      {
+                                        "description": "Code\nProxy account type, in a coded form as published in an external list.\n"
+                                      }
+                                    ]
+                                  }
+                                },
+                                "required": [
+                                  "Cd"
+                                ]
+                              },
+                              {
+                                "properties": {
+                                  "Prtry": {
+                                    "allOf": [
+                                      {
+                                        "title": "Max35Text",
+                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 35,
+                                        "example": 1.234567890123457e+34
+                                      },
+                                      {
+                                        "description": "Proprietary\nProxy account type, in a proprietary form.\n"
+                                      }
+                                    ]
+                                  }
+                                },
+                                "required": [
+                                  "Prtry"
+                                ]
+                              }
+                            ],
+                            "example": {
+                              "Cd": "EMAIL"
+                            }
+                          },
+                          {
+                            "description": "Type\nType of the proxy identification.\n"
+                          }
+                        ]
+                      },
+                      "Id": {
+                        "allOf": [
+                          {
+                            "title": "Max2048Text",
+                            "description": "Specifies a character string with a maximum length of 2048 characters.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 2048,
+                            "example": 2048
+                          },
+                          {
+                            "description": "Identification\nIdentification used to indicate the account identification under another specified name.\n"
+                          }
+                        ]
+                      }
+                    },
+                    "required": [
+                      "Id"
+                    ],
+                    "example": {
+                      "Tp": {
+                        "Cd": "IBAN"
+                      },
+                      "Id": 123
+                    }
+                  },
+                  {
+                    "description": "Proxy\nSpecifies an alternate assumed name for the identification of the account.\n"
+                  }
+                ]
+              }
+            },
+            "example": {
+              "Id": {
+                "IBAN": "BE71096123456769"
+              },
+              "Tp": {
+                "Cd": "CACC"
+              },
+              "Ccy": "EUR",
+              "Nm": "My account",
+              "Prxy": {
+                "Id": 12345
+              }
+            }
+          },
+          {
+            "description": "CreditorAccount\nAccount to which a credit entry is made.\n"
+          }
+        ]
+      },
+      "InstrForCdtrAgt": {
+        "allOf": [
+          {
+            "title": "InstructionForCreditorAgent3",
+            "description": "Further information related to the processing of the payment instruction, provided by the initiating party, and intended for the creditor agent.\n",
+            "type": "object",
+            "properties": {
+              "Cd": {
+                "allOf": [
+                  {
+                    "title": "ExternalCreditorAgentInstruction1Code",
+                    "description": "Specifies the instruction given by the creditor to the creditor agent.",
+                    "type": "string",
+                    "minLength": 1,
+                    "maxLength": 4,
+                    "example": 1234
+                  },
+                  {
+                    "description": "Code\nCoded information related to the processing of the payment instruction, provided by the initiating party, and intended for the creditor's agent.\n"
+                  }
+                ]
+              },
+              "InstrInf": {
+                "allOf": [
+                  {
+                    "title": "Max140Text",
+                    "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                    "type": "string",
+                    "minLength": 1,
+                    "maxLength": 140,
+                    "example": 12345
+                  },
+                  {
+                    "description": "InstructionInformation\nFurther information complementing the coded instruction or instruction to the creditor's agent that is bilaterally agreed or specific to a user community.\n"
+                  }
+                ]
+              }
+            },
+            "example": {
+              "Cd": "PHOA",
+              "InstrInf": "Please advise/contact next agent by phone."
+            }
+          },
+          {
+            "description": "InstructionForCreditorAgent\nSet of elements used to provide information on the remittance advice.\n"
+          }
+        ]
+      },
+      "Purp": {
+        "allOf": [
+          {
+            "title": "Purpose2Choice",
+            "description": "Specifies the underlying reason for the payment transaction.\n\nUsage: Purpose is used by the end-customers, that is initiating party,\n(ultimate) debtor, (ultimate) creditor to provide information concerning the nature of the payment. Purpose\nis a content element, which is not used for processing by any of the agents involved in the payment\nchain.\n",
+            "type": "object",
+            "anyOf": [
+              {
+                "properties": {
+                  "Cd": {
+                    "allOf": [
+                      {
+                        "title": "ExternalPurpose1Code",
+                        "description": "Specifies the external purpose code.",
+                        "type": "string",
+                        "minLength": 1,
+                        "maxLength": 4,
+                        "example": 1234
+                      },
+                      {
+                        "description": "Code\n\nUnderlying reason for the payment transaction, as published in an external purpose code list.\n"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "Cd"
+                ]
+              },
+              {
+                "properties": {
+                  "Prtry": {
+                    "allOf": [
+                      {
+                        "title": "Max35Text",
+                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                        "type": "string",
+                        "minLength": 1,
+                        "maxLength": 35,
+                        "example": 1.234567890123457e+34
+                      },
+                      {
+                        "description": "Proprietary\n\nPurpose, in a proprietary form.\n"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "Prtry"
+                ]
+              }
+            ],
+            "example": {
+              "Cd": "CH03"
+            }
+          },
+          {
+            "description": "Purpose\nUnderlying reason for the payment transaction.\n"
+          }
+        ]
+      },
+      "VrfctnOfTerms": {
+        "allOf": [
+          {
+            "title": "CryptographicLockChoice",
+            "description": "Cryptographically signed terms\n",
+            "type": "object",
+            "anyOf": [
+              {
+                "properties": {
+                  "IlpV4PrepPacket": {
+                    "allOf": [
+                      {
+                        "title": "hexBinary",
+                        "type": "string",
+                        "example": 4660,
+                        "pattern": "^[A-Za-z0-9-_]+[=]{0,2}$"
+                      },
+                      {
+                        "description": "Interledger Protocol packet (ILPv4) containing Cryptographically signed terms\n"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "IlpV4PrepPacket"
+                ]
+              },
+              {
+                "properties": {
+                  "Sh256Sgntr": {
+                    "allOf": [
+                      {
+                        "title": "Exact32HexBinaryText",
+                        "description": "Specifies a hexadecimal string.\n\nNOTE: This pattern is not the original ISO20022 specification.\n",
+                        "type": "string",
+                        "pattern": "^[A-Za-z0-9-_]{43}$",
+                        "maxLength": 48
+                      },
+                      {
+                        "description": "SHA-256 signature of the terms\n"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "Sh256Sgntr"
+                ]
+              }
+            ],
+            "example": {
+              "IlpV4PrepPacket": "1234567890ABCDEF"
+            }
+          },
+          {
+            "description": "VerificationOfTerms\nSet of elements used to provide information on the underlying terms of the transaction.\n"
+          }
+        ]
+      }
+    },
+    "required": [
+      "PmtId",
+      "IntrBkSttlmAmt",
+      "Dbtr",
+      "Cdtr"
+    ],
+    "example": {
+      "PmtId": {
+        "InstrId": "INSTRID",
+        "EndToEndId": "ENDTOENDID"
+      },
+      "PmtTpInf": {
+        "LclInstrm": {
+          "Cd": "CHQB",
+          "Prtry": "PROPRIETARY"
+        }
+      },
+      "IntrBkSttlmAmt": {
+        "Amount": 123.45,
+        "Ccy": "EUR"
+      },
+      "Dbtr": {
+        "Nm": "Debtor Name"
+      },
+      "DbtrAcct": {
+        "Id": {
+          "IBAN": "IBAN"
+        }
+      },
+      "DbtrAgt": {
+        "FinInstnId": {
+          "BICFI": "BICFI"
+        }
+      },
+      "CdtrAgt": {
+        "FinInstnId": {
+          "BICFI": "BICFI"
+        }
+      },
+      "Cdtr": {
+        "Nm": "Creditor Name"
+      },
+      "CdtrAcct": {
+        "Id": {
+          "IBAN": "IBAN"
+        }
+      },
+      "InstrForCdtrAgt": {
+        "Cd": "INSTRUCTION"
+      },
+      "Purp": {
+        "Cd": "CHAR"
+      },
+      "VrfctnOfTerms": {
+        "Cntt": "CONTENT",
+        "CnttTp": "PROPRIETARY"
+      }
+    }
+  },
+  "CreditTransferTransaction68_Put_FX_Quotes_ID": {
+    "title": "CreditTransferTransaction68_Put_FX_Quotes_ID",
+    "description": "Provides further details specific to the individual transaction(s) included in the message.\n",
+    "type": "object",
+    "properties": {
+      "PmtId": {
+        "allOf": [
+          {
+            "title": "PaymentIdentification13",
+            "description": "Provides further means of referencing a payment transaction.\n",
+            "type": "object",
+            "properties": {
+              "InstrId": {
+                "allOf": [
+                  {
+                    "title": "ULIDIdentifier",
+                    "type": "string",
+                    "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                    "example": "01AN4Z07BY79KA1307SR9X4MV3"
+                  },
+                  {
+                    "description": "InstructionIdentification (FSPIOP equivalent: transactionRequestId)\n\nDefinition: Unique identification, as assigned by an instructing party for an instructed party, to\nunambiguously identify the instruction.\n\nUsage: The instruction identification is a point to point reference that can be used between the\ninstructing party and the instructed party to refer to the individual instruction. It can be included in\nseveral messages related to the instruction.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
+                  }
+                ]
+              },
+              "EndToEndId": {
+                "allOf": [
+                  {
+                    "title": "ULIDIdentifier",
+                    "type": "string",
+                    "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                    "example": "01AN4Z07BY79KA1307SR9X4MV3"
+                  },
+                  {
+                    "description": "EndToEndIdentification (FSPIOP equivalent: transactionId)\n\nDefinition: Unique identification, as assigned by the initiating party, to unambiguously identify the\ntransaction. This identification is passed on, unchanged, throughout the entire end-to-end chain.\n\nUsage: The end-to-end identification can be used for reconciliation or to link tasks relating to the\ntransaction. It can be included in several messages related to the transaction.\n\nUsage: In case there are technical limitations to pass on multiple references, the end-to-end\nidentification must be passed on throughout the entire end-to-end chain.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
+                  }
+                ]
+              },
+              "TxId": {
+                "allOf": [
+                  {
+                    "title": "ULIDIdentifier",
+                    "type": "string",
+                    "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                    "example": "01AN4Z07BY79KA1307SR9X4MV3"
+                  },
+                  {
+                    "description": "TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)\n\nDefinition: Unique identification, as assigned by the first instructing agent, to unambiguously identify the\ntransaction that is passed on, unchanged, throughout the entire interbank chain.\n\nUsage: The transaction identification can be used for reconciliation, tracking or to link tasks relating to\nthe transaction on the interbank level.\n\nUsage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
+                  }
+                ]
+              },
+              "UETR": {
+                "allOf": [
+                  {
+                    "title": "UUIDv4Identifier",
+                    "type": "string",
+                    "example": "8f3a3b2d-3b0a-4b3f-8e4e-1b2f3f4c5d6e",
+                    "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+                  },
+                  {
+                    "description": "UETR\nUniversally unique identifier to provide an end-to-end reference of a payment transaction.\n"
+                  }
+                ]
+              },
+              "ClrSysRef": {
+                "allOf": [
+                  {
+                    "title": "Max35Text",
+                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                    "type": "string",
+                    "minLength": 1,
+                    "maxLength": 35,
+                    "example": 1.234567890123457e+34
+                  },
+                  {
+                    "description": "ClearingSystemReference\nUnique reference, as assigned by a clearing system, to unambiguously identify the instruction.\n"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "TxId"
+            ],
+            "example": {
+              "InstrId": "INSTRUCTIONID",
+              "EndToEndId": "ENDTOENDID",
+              "TxId": "TRANSACTIONID",
+              "UETR": "123e4567-e89b-12d3-a456-426614174000",
+              "ClrSysRef": "CLRSYSREF"
+            }
+          },
+          {
+            "description": "PaymentIdentification\nSet of elements used to reference a payment instruction.\n"
+          }
+        ]
+      },
+      "PmtTpInf": {
+        "allOf": [
+          {
+            "title": "PaymentTypeInformation28",
+            "description": "Provides further details of the type of payment.\n",
+            "type": "object",
+            "properties": {
+              "InstrPrty": {
+                "title": "Priority2Code",
+                "description": "Indicator of the urgency or order of importance that the instructing party\nwould like the instructed party to apply to the processing of the instruction.\n\nHIGH:  High priority\nNORM:  Normal priority\n",
+                "type": "string",
+                "enum": [
+                  "HIGH",
+                  "NORM"
+                ],
+                "example": "HIGH"
+              },
+              "ClrChanl": {
+                "title": "ClearingChannel2Code",
+                "description": "Specifies the clearing channel for the routing of the transaction, as part of\nthe payment type identification.\n\nRTGS: RealTimeGrossSettlementSystem Clearing channel is a real-time gross settlement system.\nRTNS: RealTimeNetSettlementSystem Clearing channel is a real-time net settlement system.\nMPNS: MassPaymentNetSystem Clearing channel is a mass payment  net settlement system.\nBOOK: BookTransfer Payment through internal book transfer.\n",
+                "type": "string",
+                "enum": [
+                  "RTGS",
+                  "RTNS",
+                  "MPNS",
+                  "BOOK"
+                ],
+                "example": "RTGS"
+              },
+              "SvcLvl": {
+                "allOf": [
+                  {
+                    "title": "ServiceLevel8Choice",
+                    "description": "Details about a service level.\n",
+                    "type": "object",
+                    "anyOf": [
+                      {
+                        "properties": {
+                          "Cd": {
+                            "allOf": [
+                              {
+                                "title": "ExternalServiceLevel1Code",
+                                "description": "Specifies the external service level code.",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 4,
+                                "example": 1234
+                              },
+                              {
+                                "description": "Code\nSpecifies a pre-agreed service or level of service between the parties, as published in an external service level code list.\n"
+                              }
+                            ]
+                          }
+                        },
+                        "required": [
+                          "Cd"
+                        ]
+                      },
+                      {
+                        "properties": {
+                          "Prtry": {
+                            "allOf": [
+                              {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              {
+                                "description": "Proprietary\nSpecifies a pre-agreed service or level of service between the parties, as a proprietary code.\n"
+                              }
+                            ]
+                          }
+                        },
+                        "required": [
+                          "Prtry"
+                        ]
+                      }
+                    ],
+                    "example": {
+                      "Cd": "SEPA"
+                    }
+                  },
+                  {
+                    "description": "ServiceLevel\nAgreement under which or rules under which the transaction should be processed.\n"
+                  }
+                ]
+              },
+              "LclInstrm": {
+                "allOf": [
+                  {
+                    "title": "LocalInstrument2Choice",
+                    "type": "object",
+                    "description": "Specifies the local instrument, as published in an external local instrument code list or as a proprietary code.\n",
+                    "anyOf": [
+                      {
+                        "properties": {
+                          "Cd": {
+                            "allOf": [
+                              {
+                                "title": "ExternalLocalInstrument1Code",
+                                "description": "Specifies the external local instrument identification code.",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 12345
+                              },
+                              {
+                                "description": "Code\nSpecifies the local instrument, as published in an external local instrument code list.\n"
+                              }
+                            ]
+                          }
+                        },
+                        "required": [
+                          "Cd"
+                        ]
+                      },
+                      {
+                        "properties": {
+                          "Prtry": {
+                            "allOf": [
+                              {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              {
+                                "description": "Proprietary\nSpecifies the local instrument, as a proprietary code.\n"
+                              }
+                            ]
+                          }
+                        },
+                        "required": [
+                          "Prtry"
+                        ]
+                      }
+                    ],
+                    "example": {
+                      "Cd": "CH03"
+                    }
+                  },
+                  {
+                    "description": "LocalInstrument\nDefinition: User community specific instrument.\nUsage: This element is used to specify a local instrument, local clearing option and/or further qualify the service or service level.\n"
+                  }
+                ]
+              },
+              "CtgyPurp": {
+                "allOf": [
+                  {
+                    "title": "CategoryPurpose1Choice",
+                    "description": "Contains details about high level purpose of the mandate based on a set of pre-defined categories.\n",
+                    "type": "object",
+                    "anyOf": [
+                      {
+                        "properties": {
+                          "Cd": {
+                            "allOf": [
+                              {
+                                "description": "Specifies the category purpose, as published in an external category purpose code list.\nExternal code sets can be downloaded from www.iso20022.org.\n",
+                                "maxLength": 4,
+                                "minLength": 1,
+                                "type": "string",
+                                "example": 1234
+                              },
+                              {
+                                "description": "Code\nCategory purpose, as published in an external category purpose code list.\n"
+                              }
+                            ]
+                          }
+                        },
+                        "required": [
+                          "Cd"
+                        ]
+                      },
+                      {
+                        "properties": {
+                          "Prtry": {
+                            "allOf": [
+                              {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              {
+                                "description": "Proprietary\nCategory purpose, in a proprietary form.\n"
+                              }
+                            ]
+                          }
+                        },
+                        "required": [
+                          "Prtry"
+                        ]
+                      }
+                    ],
+                    "example": {
+                      "Cd": "CASH"
+                    }
+                  },
+                  {
+                    "description": "CategoryPurpose\nSpecifies the high level purpose of the instruction based on a set of pre-defined categories.\n"
+                  }
+                ]
+              }
+            },
+            "example": {
+              "InstrPrty": "NORM",
+              "ClrChanl": "RTGS",
+              "SvcLvl": {
+                "Cd": "SEPA"
+              },
+              "LclInstrm": {
+                "Cd": "CORE"
+              },
+              "CtgyPurp": {
+                "Cd": "CASH"
+              }
+            }
+          },
+          {
+            "description": "PaymentTypeInformation\nSet of elements used to further specify the type of transaction.\n"
+          }
+        ]
+      },
+      "UndrlygCstmrCdtTrf": {
+        "allOf": [
+          {
+            "title": "UnderlyingCustomerCreditTransfer",
+            "type": "object",
+            "properties": {
+              "InstdAmt": {
+                "allOf": [
+                  {
+                    "title": "ActiveOrHistoricCurrencyAndAmount",
+                    "type": "object",
+                    "description": "A number of monetary units specified in an active or a historic currency where the unit of currency is explicit and compliant with ISO 4217.\n",
+                    "properties": {
+                      "ActiveOrHistoricCurrencyAndAmount": {
+                        "allOf": [
+                          {
+                            "title": "ActiveOrHistoricCurrencyAndAmount_SimpleType",
+                            "type": "string",
+                            "example": 123.45,
+                            "pattern": "^(?!0\\d)(\\d{1,18}|\\d{1,17}.\\d{1}|\\d{1,16}.\\d{1,2}|\\d{1,15}.\\d{1,3}|\\d{1,14}.\\d{1,4}|\\d{1,13}.\\d{1,5})$"
+                          },
+                          {
+                            "description": "Amount of money to be moved between the debtor and creditor, before deduction of charges, expressed in the currency as ordered by the initiating party.\n"
+                          }
+                        ]
+                      },
+                      "Ccy": {
+                        "allOf": [
+                          {
+                            "title": "ActiveOrHistoricCurrencyCode",
+                            "type": "string",
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
+                          },
+                          {
+                            "description": "Currency\nIdentification of the currency in which the account is held.\n"
+                          }
+                        ]
+                      }
+                    },
+                    "required": [
+                      "ActiveOrHistoricCurrencyAndAmount",
+                      "Ccy"
+                    ],
+                    "example": {
+                      "ActiveOrHistoricCurrencyAndAmount": 123.45,
+                      "Ccy": "USD"
+                    }
+                  },
+                  {
+                    "description": "InstructedAmount\nAmount of money to be moved between the debtor and creditor, before deduction of charges, expressed in the currency as ordered by the initiating party.\n"
+                  }
+                ]
+              },
+              "Dbtr": {
+                "allOf": [
+                  {
+                    "title": "PartyIdentification272",
+                    "description": "Specifies the identification of a person or an organisation.\n",
+                    "type": "object",
+                    "properties": {
+                      "Nm": {
+                        "allOf": [
+                          {
+                            "title": "Max140Text",
+                            "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 140,
+                            "example": 12345
+                          },
+                          {
+                            "description": "Name\nName by which a party is known and which is usually used to identify that party.\n"
+                          }
+                        ]
+                      },
+                      "PstlAdr": {
+                        "allOf": [
+                          {
+                            "title": "PostalAddress27",
+                            "type": "object",
+                            "description": "Information that locates and identifies a specific address, as defined by postal services.\n",
+                            "properties": {
+                              "AdrTp": {
+                                "title": "AddressType3Choice",
+                                "type": "object",
+                                "description": "Choice of formats for the type of address.\n",
+                                "anyOf": [
+                                  {
+                                    "properties": {
+                                      "Cd": {
+                                        "allOf": [
+                                          {
+                                            "description": "AddressType2Code\nSpecifies the type of address.\nADDR Address\nPBOX PostBox\nHOME Home\nBIZZ Business\nMLTO MailingTo\nDLVY Delivery\n",
+                                            "enum": [
+                                              "ADDR",
+                                              "PBOX",
+                                              "HOME",
+                                              "BIZZ",
+                                              "MLTO",
+                                              "DLVY"
+                                            ],
+                                            "type": "string",
+                                            "example": "ADDR"
+                                          },
+                                          {
+                                            "description": "Code\nType of address expressed as a code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Cd"
+                                    ]
+                                  },
+                                  {
+                                    "properties": {
+                                      "Prtry": {
+                                        "allOf": [
+                                          {
+                                            "title": "GenericIdentification30",
+                                            "type": "object",
+                                            "description": "Generic scheme identification for a party.\n",
+                                            "properties": {
+                                              "Id": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Exact4AlphaNumericText",
+                                                    "description": "Specifies an alphanumeric string with a length of 4 characters.\n",
+                                                    "type": "string",
+                                                    "pattern": "^[a-zA-Z0-9]{4}$",
+                                                    "example": 1234
+                                                  },
+                                                  {
+                                                    "description": "Identification\nProprietary information, often a code, issued by the data source scheme issuer.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "Issr": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "Issuer\nEntity that assigns the identification.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "SchmeNm": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "SchemeName\nShort textual description of the scheme.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Id",
+                                              "Issr"
+                                            ],
+                                            "example": {
+                                              "Id": 1234,
+                                              "Issr": "BIC",
+                                              "SchmeNm": "BICFI"
+                                            }
+                                          },
+                                          {
+                                            "description": "Proprietary\nType of address expressed as a proprietary code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Prtry"
+                                    ]
+                                  }
+                                ],
+                                "example": {
+                                  "Cd": "ADDR"
+                                }
+                              },
+                              "CareOf": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "Dept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "SubDept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "StrtNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "BldgNb": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "BldgNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "Flr": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "UnitNb": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "PstBx": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "Room": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "PstCd": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "TwnNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "TwnLctnNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "DstrctNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "CtrySubDvsn": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "Ctry": {
+                                "title": "CountryCode",
+                                "type": "string",
+                                "pattern": "^[A-Z]{2,2}$",
+                                "example": "US",
+                                "description": "Code to identify a country, a dependency, or another area of particular geopolitical interest, on the basis of country names obtained from the United Nations (ISO 3166, Alpha-2 code).\n"
+                              },
+                              "AdrLine": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              }
+                            },
+                            "example": {
+                              "AdrTp": "ADDR",
+                              "CareOf": "CareOf",
+                              "Dept": "Dept",
+                              "SubDept": "SubDept",
+                              "StrtNm": "StrtNm",
+                              "BldgNb": "BldgNb",
+                              "BldgNm": "BldgNm",
+                              "Flr": "Flr",
+                              "UnitNb": "UnitNb",
+                              "PstBx": "PstBx",
+                              "Room": "Room",
+                              "PstCd": "PstCd",
+                              "TwnNm": "TwnNm",
+                              "TwnLctnNm": "TwnLctnNm",
+                              "DstrctNm": "DstrctNm",
+                              "CtrySubDvsn": "CtrySubDvsn",
+                              "Ctry": "Ctry",
+                              "AdrLine": "AdrLine"
+                            }
+                          },
+                          {
+                            "description": "Postal Address\nInformation that locates and identifies a specific address, as defined by postal services.\n"
+                          }
+                        ]
+                      },
+                      "Id": {
+                        "allOf": [
+                          {
+                            "title": "Party52Choice",
+                            "description": "NOTE: Unsure on the description.\n",
+                            "type": "object",
+                            "anyOf": [
+                              {
+                                "properties": {
+                                  "OrgId": {
+                                    "allOf": [
+                                      {
+                                        "title": "OrganisationIdentification39",
+                                        "description": "Unique and unambiguous way to identify an organisation.\n",
+                                        "type": "object",
+                                        "properties": {
+                                          "AnyBIC": {
+                                            "allOf": [
+                                              {
+                                                "title": "AnyBICDec2014Identifier",
+                                                "type": "string",
+                                                "description": "AnyBICDec2014Identifier\nCode allocated to a financial or non-financial institution by the\nISO 9362 Registration Authority, as described in ISO 9362: 2014\n- \"Banking - Banking telecommunication messages - Business identifier code (BIC)\".\n",
+                                                "pattern": "^[A-Z0-9]{4,4}[A-Z]{2,2}[A-Z0-9]{2,2}([A-Z0-9]{3,3}){0,1}$",
+                                                "example": "J5BMVH7D"
+                                              },
+                                              {
+                                                "description": "AnyBIC\nBusiness identification code of the organisation.\n"
+                                              }
+                                            ]
+                                          },
+                                          "LEI": {
+                                            "allOf": [
+                                              {
+                                                "title": "LEIIdentifier",
+                                                "description": "Legal Entity Identifier is a code allocated to a party as described in ISO 17442 \"Financial Services - Legal Entity Identifier (LEI)\". ^([0-9A-Z]{18,18}[0-9]{2,2})$\n",
+                                                "type": "string",
+                                                "pattern": "^[A-Z0-9]{18,18}[0-9]{2,2}$",
+                                                "example": "529900T8BM49AURSDO55"
+                                              },
+                                              {
+                                                "description": "LEI\nLegal entity identification as an alternate identification for a party.\n"
+                                              }
+                                            ]
+                                          },
+                                          "Othr": {
+                                            "allOf": [
+                                              {
+                                                "title": "GenericOrganisationIdentification3",
+                                                "type": "object",
+                                                "description": "Information related to an identification of an organisation.\n",
+                                                "properties": {
+                                                  "Id": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "Max256Text",
+                                                        "description": "Specifies a character string with a maximum length of 256 characters.\n",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 256,
+                                                        "example": 256
+                                                      },
+                                                      {
+                                                        "description": "Identification\nIdentification assigned by an institution.\n"
+                                                      }
+                                                    ]
+                                                  },
+                                                  "SchmeNm": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "OrganisationIdentificationSchemeName1Choice",
+                                                        "description": "Choice of format for the organisation identification.\n",
+                                                        "type": "object",
+                                                        "properties": {
+                                                          "Cd": {
+                                                            "allOf": [
+                                                              {
+                                                                "title": "ExternalOrganisationIdentification1Code",
+                                                                "description": "Specifies the external organisation identification code.",
+                                                                "type": "string",
+                                                                "minLength": 1,
+                                                                "maxLength": 4,
+                                                                "example": 1234
+                                                              },
+                                                              {
+                                                                "description": "Code\nName of the identification scheme, in a coded form as published in an external list.\n"
+                                                              }
+                                                            ]
+                                                          },
+                                                          "Prtry": {
+                                                            "allOf": [
+                                                              {
+                                                                "title": "Max35Text",
+                                                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                                "type": "string",
+                                                                "minLength": 1,
+                                                                "maxLength": 35,
+                                                                "example": 1.234567890123457e+34
+                                                              },
+                                                              {
+                                                                "description": "Proprietary\nName of the identification scheme, in a free text form.\n"
+                                                              }
+                                                            ]
+                                                          }
+                                                        },
+                                                        "anyOf": [
+                                                          {
+                                                            "properties": {
+                                                              "Cd": {}
+                                                            }
+                                                          },
+                                                          {
+                                                            "properties": {
+                                                              "Prtry": {}
+                                                            }
+                                                          }
+                                                        ],
+                                                        "example": {
+                                                          "Cd": "BIC"
+                                                        }
+                                                      },
+                                                      {
+                                                        "description": "SchemeName\nName of the identification scheme.\n"
+                                                      }
+                                                    ]
+                                                  },
+                                                  "Issr": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "Max35Text",
+                                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 35,
+                                                        "example": 1.234567890123457e+34
+                                                      },
+                                                      {
+                                                        "description": "Issuer\nEntity that assigns the identification.\n"
+                                                      }
+                                                    ]
+                                                  }
+                                                },
+                                                "required": [
+                                                  "Id"
+                                                ],
+                                                "example": {
+                                                  "Id": 123,
+                                                  "SchmeNm": {
+                                                    "Cd": "BIC"
+                                                  },
+                                                  "Issr": "BIC"
+                                                }
+                                              },
+                                              {
+                                                "description": "Other\nUnique identification of an organisation, as assigned by an institution, using an identification scheme.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "example": {
+                                          "AnyBIC": "BICFI",
+                                          "LEI": "529900T8BM49AURSDO55",
+                                          "Othr": {
+                                            "Id": 123,
+                                            "SchmeNm": {
+                                              "Cd": "BIC"
+                                            },
+                                            "Issr": "BIC"
+                                          }
+                                        }
+                                      },
+                                      {
+                                        "description": "Organisation\nUnique and unambiguous way to identify an organisation.\n"
+                                      }
+                                    ]
+                                  }
+                                },
+                                "required": [
+                                  "OrgId"
+                                ]
+                              },
+                              {
+                                "properties": {
+                                  "PrvtId": {
+                                    "allOf": [
+                                      {
+                                        "title": "PersonIdentification18",
+                                        "description": "Unique and unambiguous way to identify a person.\n",
+                                        "type": "object",
+                                        "properties": {
+                                          "DtAndPlcOfBirth": {
+                                            "allOf": [
+                                              {
+                                                "title": "DateAndPlaceOfBirth1",
+                                                "description": "Details about date and place of birth of a person.\n",
+                                                "type": "object",
+                                                "properties": {
+                                                  "BirthDt": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "ISODate",
+                                                        "description": "A particular point in the progression of time in a calendar year expressed in the YYYY-MM-DD format. This representation is defined in \"XML Schema Part 2: Datatypes Second Edition - W3C Recommendation 28 October 2004\" which is aligned with ISO 8601.\n",
+                                                        "type": "string",
+                                                        "format": "date",
+                                                        "example": "2013-03-07"
+                                                      },
+                                                      {
+                                                        "description": "BirthDate\nDate on which a person was born.\n"
+                                                      }
+                                                    ]
+                                                  },
+                                                  "PrvcOfBirth": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "Max35Text",
+                                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 35,
+                                                        "example": 1.234567890123457e+34
+                                                      },
+                                                      {
+                                                        "description": "ProvinceOfBirth\nProvince where a person was born.\n"
+                                                      }
+                                                    ]
+                                                  },
+                                                  "CityOfBirth": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "Max35Text",
+                                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 35,
+                                                        "example": 1.234567890123457e+34
+                                                      },
+                                                      {
+                                                        "description": "CityOfBirth\nCity where a person was born.\n"
+                                                      }
+                                                    ]
+                                                  },
+                                                  "CtryOfBirth": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "CountryCode",
+                                                        "type": "string",
+                                                        "pattern": "^[A-Z]{2,2}$",
+                                                        "example": "US",
+                                                        "description": "Code to identify a country, a dependency, or another area of particular geopolitical interest, on the basis of country names obtained from the United Nations (ISO 3166, Alpha-2 code).\n"
+                                                      },
+                                                      {
+                                                        "description": "CountryOfBirth\nCountry where a person was born.\n"
+                                                      }
+                                                    ]
+                                                  }
+                                                },
+                                                "required": [
+                                                  "BirthDt",
+                                                  "CityOfBirth",
+                                                  "CtryOfBirth"
+                                                ],
+                                                "example": {
+                                                  "BirthDt": "1970-01-01",
+                                                  "PrvcOfBirth": "ON",
+                                                  "CityOfBirth": "Ottawa",
+                                                  "CtryOfBirth": "CA"
+                                                }
+                                              },
+                                              {
+                                                "description": "DateAndPlaceOfBirth\nDate and place of birth of a person.\n"
+                                              }
+                                            ]
+                                          },
+                                          "Othr": {
+                                            "allOf": [
+                                              {
+                                                "title": "GenericPersonIdentification2",
+                                                "type": "object",
+                                                "description": "Identification of a person.",
+                                                "properties": {
+                                                  "Id": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "Max256Text",
+                                                        "description": "Specifies a character string with a maximum length of 256 characters.\n",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 256,
+                                                        "example": 256
+                                                      },
+                                                      {
+                                                        "description": "Identification\nUnique and unambiguous identification of a person.\n"
+                                                      }
+                                                    ]
+                                                  },
+                                                  "SchmeNm": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "PersonIdentificationSchemeName1Choice",
+                                                        "description": "Sets of elements to identify a name of the identification scheme.\n",
+                                                        "type": "object",
+                                                        "anyOf": [
+                                                          {
+                                                            "properties": {
+                                                              "Cd": {
+                                                                "allOf": [
+                                                                  {
+                                                                    "title": "ExternalPersonIdentification1Code",
+                                                                    "description": "Specifies the external person identification code.",
+                                                                    "type": "string",
+                                                                    "minLength": 1,
+                                                                    "maxLength": 4,
+                                                                    "example": 1234
+                                                                  },
+                                                                  {
+                                                                    "description": "Code\nName of the identification scheme, in a coded form as published in an external list.\n"
+                                                                  }
+                                                                ]
+                                                              }
+                                                            },
+                                                            "required": [
+                                                              "Cd"
+                                                            ]
+                                                          },
+                                                          {
+                                                            "properties": {
+                                                              "Prtry": {
+                                                                "allOf": [
+                                                                  {
+                                                                    "title": "Max35Text",
+                                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                                    "type": "string",
+                                                                    "minLength": 1,
+                                                                    "maxLength": 35,
+                                                                    "example": 1.234567890123457e+34
+                                                                  },
+                                                                  {
+                                                                    "description": "Proprietary\nName of the identification scheme, in a free text form.\n"
+                                                                  }
+                                                                ]
+                                                              }
+                                                            },
+                                                            "required": [
+                                                              "Prtry"
+                                                            ]
+                                                          }
+                                                        ],
+                                                        "example": {
+                                                          "Cd": "CCPT"
+                                                        }
+                                                      },
+                                                      {
+                                                        "description": "SchemeName\nName of the identification scheme.\n"
+                                                      }
+                                                    ]
+                                                  },
+                                                  "Issr": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "Max35Text",
+                                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 35,
+                                                        "example": 1.234567890123457e+34
+                                                      },
+                                                      {
+                                                        "description": "Issuer\nEntity that assigns the identification.\n"
+                                                      }
+                                                    ]
+                                                  }
+                                                },
+                                                "required": [
+                                                  "Id"
+                                                ],
+                                                "example": {
+                                                  "Id": 123,
+                                                  "SchmeNm": {
+                                                    "Cd": "DRLC"
+                                                  },
+                                                  "Issr": "BIC"
+                                                }
+                                              },
+                                              {
+                                                "description": "Other\nUnique identification of a person, as assigned by an institution, using an identification scheme.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "example": {
+                                          "DtAndPlcOfBirth": {
+                                            "Dt": "2018-01-01",
+                                            "CityOfBirth": "City"
+                                          },
+                                          "Othr": {
+                                            "Id": 123,
+                                            "SchmeNm": {
+                                              "Cd": "CUST",
+                                              "Prtry": 1
+                                            }
+                                          }
+                                        }
+                                      },
+                                      {
+                                        "description": "Person\nUnique and unambiguous identification of a person, for example a passport.\n"
+                                      }
+                                    ]
+                                  }
+                                },
+                                "required": [
+                                  "PrvtId"
+                                ]
+                              }
+                            ],
+                            "example": {
+                              "OrgId": {
+                                "AnyBIC": "BIC"
+                              },
+                              "PrvtId": {
+                                "DtAndPlcOfBirth": {
+                                  "Dt": "2018-01-01",
+                                  "CityOfBirth": "City"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "description": "Identification\nUnique and unambiguous identification of a party.\n"
+                          }
+                        ]
+                      },
+                      "CtryOfRes": {
+                        "allOf": [
+                          {
+                            "title": "CountryCode",
+                            "type": "string",
+                            "pattern": "^[A-Z]{2,2}$",
+                            "example": "US",
+                            "description": "Code to identify a country, a dependency, or another area of particular geopolitical interest, on the basis of country names obtained from the United Nations (ISO 3166, Alpha-2 code).\n"
+                          },
+                          {
+                            "description": "Country of Residence\nCountry in which a person resides (the place of a person's home). In the case of a company, it is the country from which the affairs of that company are directed.\n"
+                          }
+                        ]
+                      },
+                      "CtctDtls": {
+                        "allOf": [
+                          {
+                            "title": "Contact13",
+                            "description": "Specifies the details of the contact person.\n",
+                            "type": "object",
+                            "properties": {
+                              "NmPrfx": {
+                                "allOf": [
+                                  {
+                                    "description": "Specifies the terms used to formally address a person.\n\nDOCT: Doctor or Dr\nMADM: Madam\nMISS: Miss\nMIST: Mistress\nMIKS: Mx\n",
+                                    "enum": [
+                                      "DOCT",
+                                      "MADM",
+                                      "MISS",
+                                      "MIST",
+                                      "MIKS"
+                                    ],
+                                    "type": "string",
+                                    "example": "DOCT"
+                                  },
+                                  {
+                                    "description": "NamePrefix\nSpecifies the terms used to formally address a person.\n"
+                                  }
+                                ]
+                              },
+                              "Nm": {
+                                "allOf": [
+                                  {
+                                    "title": "Max140Text",
+                                    "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 140,
+                                    "example": 12345
+                                  },
+                                  {
+                                    "description": "Name\nName by which a party is known and which is usually used to identify that party.\n"
+                                  }
+                                ]
+                              },
+                              "PhneNb": {
+                                "allOf": [
+                                  {
+                                    "title": "PhoneNumber",
+                                    "type": "string",
+                                    "description": "Double check this regex.\n",
+                                    "pattern": "^\\+[0-9]{1,3}-[0-9()+\\-]{1,30}$"
+                                  },
+                                  {
+                                    "description": "PhoneNumber\nCollection of information that identifies a phone number, as defined by telecom services.\n"
+                                  }
+                                ]
+                              },
+                              "MobNb": {
+                                "allOf": [
+                                  {
+                                    "title": "PhoneNumber",
+                                    "type": "string",
+                                    "description": "Double check this regex.\n",
+                                    "pattern": "^\\+[0-9]{1,3}-[0-9()+\\-]{1,30}$"
+                                  },
+                                  {
+                                    "description": "MobilePhoneNumber\nCollection of information that identifies a mobile phone number, as defined by telecom services.\n"
+                                  }
+                                ]
+                              },
+                              "FaxNb": {
+                                "allOf": [
+                                  {
+                                    "title": "PhoneNumber",
+                                    "type": "string",
+                                    "description": "Double check this regex.\n",
+                                    "pattern": "^\\+[0-9]{1,3}-[0-9()+\\-]{1,30}$"
+                                  },
+                                  {
+                                    "description": "FaxNumber\nCollection of information that identifies a fax number, as defined by telecom services.\n"
+                                  }
+                                ]
+                              },
+                              "URLAdr": {
+                                "allOf": [
+                                  {
+                                    "title": "Max2048Text",
+                                    "description": "Specifies a character string with a maximum length of 2048 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 2048,
+                                    "example": 2048
+                                  },
+                                  {
+                                    "description": "URLAddress\nAddress for the Universal Resource Locator (URL), for example an address used over the www (HTTP) service.\n"
+                                  }
+                                ]
+                              },
+                              "EmailAdr": {
+                                "allOf": [
+                                  {
+                                    "title": "Max256Text",
+                                    "description": "Specifies a character string with a maximum length of 256 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 256,
+                                    "example": 256
+                                  },
+                                  {
+                                    "description": "EmailAddress\nAddress for electronic mail (e-mail).\n"
+                                  }
+                                ]
+                              },
+                              "EmailPurp": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "EmailPurpose\nPurpose for which an email address may be used.\n"
+                                  }
+                                ]
+                              },
+                              "JobTitl": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "JobTitle\nTitle of the function.\n"
+                                  }
+                                ]
+                              },
+                              "Rspnsblty": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "Responsibility\nRole of a person in an organisation.\n"
+                                  }
+                                ]
+                              },
+                              "Dept": {
+                                "allOf": [
+                                  {
+                                    "title": "Max70Text",
+                                    "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 70,
+                                    "example": 1.2345678901234567e+99
+                                  },
+                                  {
+                                    "description": "Department\nIdentification of a division of a large organisation or building.\n"
+                                  }
+                                ]
+                              },
+                              "Othr": {
+                                "allOf": [
+                                  {
+                                    "title": "OtherContact1",
+                                    "description": "Communication device number or electronic address used for communication.\n",
+                                    "type": "object",
+                                    "properties": {
+                                      "ChanlTp": {
+                                        "allOf": [
+                                          {
+                                            "title": "Max4Text",
+                                            "description": "Specifies a character string with a maximum length of 4 characters.\n",
+                                            "type": "string",
+                                            "minLength": 1,
+                                            "maxLength": 4,
+                                            "example": 1234
+                                          },
+                                          {
+                                            "description": "ChannelType\nMethod used to contact the financial institution's contact for the specific tax region.\n"
+                                          }
+                                        ]
+                                      },
+                                      "Id": {
+                                        "allOf": [
+                                          {
+                                            "title": "Max128Text",
+                                            "description": "Specifies a character string with a maximum length of 128 characters.\n",
+                                            "type": "string",
+                                            "minLength": 1,
+                                            "maxLength": 128,
+                                            "example": 12345
+                                          },
+                                          {
+                                            "description": "Identifier\nCommunication value such as phone number or email address.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "ChanlTp"
+                                    ],
+                                    "example": {
+                                      "ChanlTp": "PHON",
+                                      "Id": 1234567890
+                                    }
+                                  },
+                                  {
+                                    "description": "OtherContact\nContact details in another form.\n"
+                                  }
+                                ]
+                              },
+                              "PrefrdMtd": {
+                                "allOf": [
+                                  {
+                                    "title": "PreferredContactMethod2Code",
+                                    "description": "Preferred method used to reach the individual contact within an organisation.\nLETT: Letter\nMAIL: Email\nPHON: Phone\nFAXX: Fax\nCELL: Mobile phone\n",
+                                    "type": "string",
+                                    "enum": [
+                                      "LETT",
+                                      "MAIL",
+                                      "PHON",
+                                      "FAXX",
+                                      "CELL"
+                                    ],
+                                    "example": "MAIL"
+                                  },
+                                  {
+                                    "description": "PreferredContactMethod\nPreferred method used to reach the contact.\n"
+                                  }
+                                ]
+                              }
+                            },
+                            "example": {
+                              "NmPrfx": "Mr",
+                              "Nm": "John Doe",
+                              "PhneNb": "+123-123-321",
+                              "MobNb": "+123-123-321",
+                              "FaxNb": "+123-123-321",
+                              "URLAdr": "http://www.example.com",
+                              "EmailAdr": "example@example.com"
+                            }
+                          },
+                          {
+                            "description": "Contact Details\nSet of elements used to indicate how to contact the party.\n"
+                          }
+                        ]
+                      }
+                    },
+                    "required": [
+                      "Id"
+                    ],
+                    "example": {
+                      "Nm": "John Doe",
+                      "PstlAdr": {
+                        "AdrTp": "ADDR",
+                        "Dept": "Dept",
+                        "SubDept": "SubDept",
+                        "StrtNm": "StrtNm",
+                        "BldgNb": "BldgNb",
+                        "PstCd": "PstCd",
+                        "TwnNm": "TwnNm",
+                        "CtrySubDvsn": "CtrySubDvsn",
+                        "Ctry": "Ctry"
+                      },
+                      "Id": {
+                        "OrgId": {
+                          "AnyBIC": "BIC"
+                        },
+                        "PrvtId": {
+                          "DtAndPlcOfBirth": {
+                            "Dt": "2018-01-01",
+                            "CityOfBirth": "City"
+                          }
+                        }
+                      },
+                      "CtryOfRes": "BE",
+                      "CtctDtls": {
+                        "NmPrfx": "Mr",
+                        "Nm": "John Doe",
+                        "PhneNb": "+123-123-321",
+                        "MobNb": "+123-123-321",
+                        "FaxNb": "+123-123-321",
+                        "EmailAdr": "example@example.com"
+                      }
+                    }
+                  },
+                  {
+                    "description": "Party that owes an amount of money to the (ultimate) creditor.\n"
+                  }
+                ]
+              },
+              "Cdtr": {
+                "allOf": [
+                  {
+                    "title": "PartyIdentification272",
+                    "description": "Specifies the identification of a person or an organisation.\n",
+                    "type": "object",
+                    "properties": {
+                      "Nm": {
+                        "allOf": [
+                          {
+                            "title": "Max140Text",
+                            "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 140,
+                            "example": 12345
+                          },
+                          {
+                            "description": "Name\nName by which a party is known and which is usually used to identify that party.\n"
+                          }
+                        ]
+                      },
+                      "PstlAdr": {
+                        "allOf": [
+                          {
+                            "title": "PostalAddress27",
+                            "type": "object",
+                            "description": "Information that locates and identifies a specific address, as defined by postal services.\n",
+                            "properties": {
+                              "AdrTp": {
+                                "title": "AddressType3Choice",
+                                "type": "object",
+                                "description": "Choice of formats for the type of address.\n",
+                                "anyOf": [
+                                  {
+                                    "properties": {
+                                      "Cd": {
+                                        "allOf": [
+                                          {
+                                            "description": "AddressType2Code\nSpecifies the type of address.\nADDR Address\nPBOX PostBox\nHOME Home\nBIZZ Business\nMLTO MailingTo\nDLVY Delivery\n",
+                                            "enum": [
+                                              "ADDR",
+                                              "PBOX",
+                                              "HOME",
+                                              "BIZZ",
+                                              "MLTO",
+                                              "DLVY"
+                                            ],
+                                            "type": "string",
+                                            "example": "ADDR"
+                                          },
+                                          {
+                                            "description": "Code\nType of address expressed as a code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Cd"
+                                    ]
+                                  },
+                                  {
+                                    "properties": {
+                                      "Prtry": {
+                                        "allOf": [
+                                          {
+                                            "title": "GenericIdentification30",
+                                            "type": "object",
+                                            "description": "Generic scheme identification for a party.\n",
+                                            "properties": {
+                                              "Id": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Exact4AlphaNumericText",
+                                                    "description": "Specifies an alphanumeric string with a length of 4 characters.\n",
+                                                    "type": "string",
+                                                    "pattern": "^[a-zA-Z0-9]{4}$",
+                                                    "example": 1234
+                                                  },
+                                                  {
+                                                    "description": "Identification\nProprietary information, often a code, issued by the data source scheme issuer.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "Issr": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "Issuer\nEntity that assigns the identification.\n"
+                                                  }
+                                                ]
+                                              },
+                                              "SchmeNm": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "Max35Text",
+                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                    "type": "string",
+                                                    "minLength": 1,
+                                                    "maxLength": 35,
+                                                    "example": 1.234567890123457e+34
+                                                  },
+                                                  {
+                                                    "description": "SchemeName\nShort textual description of the scheme.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Id",
+                                              "Issr"
+                                            ],
+                                            "example": {
+                                              "Id": 1234,
+                                              "Issr": "BIC",
+                                              "SchmeNm": "BICFI"
+                                            }
+                                          },
+                                          {
+                                            "description": "Proprietary\nType of address expressed as a proprietary code.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Prtry"
+                                    ]
+                                  }
+                                ],
+                                "example": {
+                                  "Cd": "ADDR"
+                                }
+                              },
+                              "CareOf": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "Dept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "SubDept": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "StrtNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "BldgNb": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "BldgNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "Flr": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "UnitNb": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "PstBx": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "Room": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              },
+                              "PstCd": {
+                                "title": "Max16Text",
+                                "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 16,
+                                "example": 1234567890123456
+                              },
+                              "TwnNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "TwnLctnNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "DstrctNm": {
+                                "title": "Max140Text",
+                                "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 140,
+                                "example": 12345
+                              },
+                              "CtrySubDvsn": {
+                                "title": "Max35Text",
+                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 35,
+                                "example": 1.234567890123457e+34
+                              },
+                              "Ctry": {
+                                "title": "CountryCode",
+                                "type": "string",
+                                "pattern": "^[A-Z]{2,2}$",
+                                "example": "US",
+                                "description": "Code to identify a country, a dependency, or another area of particular geopolitical interest, on the basis of country names obtained from the United Nations (ISO 3166, Alpha-2 code).\n"
+                              },
+                              "AdrLine": {
+                                "title": "Max70Text",
+                                "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 70,
+                                "example": 1.2345678901234567e+99
+                              }
+                            },
+                            "example": {
+                              "AdrTp": "ADDR",
+                              "CareOf": "CareOf",
+                              "Dept": "Dept",
+                              "SubDept": "SubDept",
+                              "StrtNm": "StrtNm",
+                              "BldgNb": "BldgNb",
+                              "BldgNm": "BldgNm",
+                              "Flr": "Flr",
+                              "UnitNb": "UnitNb",
+                              "PstBx": "PstBx",
+                              "Room": "Room",
+                              "PstCd": "PstCd",
+                              "TwnNm": "TwnNm",
+                              "TwnLctnNm": "TwnLctnNm",
+                              "DstrctNm": "DstrctNm",
+                              "CtrySubDvsn": "CtrySubDvsn",
+                              "Ctry": "Ctry",
+                              "AdrLine": "AdrLine"
+                            }
+                          },
+                          {
+                            "description": "Postal Address\nInformation that locates and identifies a specific address, as defined by postal services.\n"
+                          }
+                        ]
+                      },
+                      "Id": {
+                        "allOf": [
+                          {
+                            "title": "Party52Choice",
+                            "description": "NOTE: Unsure on the description.\n",
+                            "type": "object",
+                            "anyOf": [
+                              {
+                                "properties": {
+                                  "OrgId": {
+                                    "allOf": [
+                                      {
+                                        "title": "OrganisationIdentification39",
+                                        "description": "Unique and unambiguous way to identify an organisation.\n",
+                                        "type": "object",
+                                        "properties": {
+                                          "AnyBIC": {
+                                            "allOf": [
+                                              {
+                                                "title": "AnyBICDec2014Identifier",
+                                                "type": "string",
+                                                "description": "AnyBICDec2014Identifier\nCode allocated to a financial or non-financial institution by the\nISO 9362 Registration Authority, as described in ISO 9362: 2014\n- \"Banking - Banking telecommunication messages - Business identifier code (BIC)\".\n",
+                                                "pattern": "^[A-Z0-9]{4,4}[A-Z]{2,2}[A-Z0-9]{2,2}([A-Z0-9]{3,3}){0,1}$",
+                                                "example": "J5BMVH7D"
+                                              },
+                                              {
+                                                "description": "AnyBIC\nBusiness identification code of the organisation.\n"
+                                              }
+                                            ]
+                                          },
+                                          "LEI": {
+                                            "allOf": [
+                                              {
+                                                "title": "LEIIdentifier",
+                                                "description": "Legal Entity Identifier is a code allocated to a party as described in ISO 17442 \"Financial Services - Legal Entity Identifier (LEI)\". ^([0-9A-Z]{18,18}[0-9]{2,2})$\n",
+                                                "type": "string",
+                                                "pattern": "^[A-Z0-9]{18,18}[0-9]{2,2}$",
+                                                "example": "529900T8BM49AURSDO55"
+                                              },
+                                              {
+                                                "description": "LEI\nLegal entity identification as an alternate identification for a party.\n"
+                                              }
+                                            ]
+                                          },
+                                          "Othr": {
+                                            "allOf": [
+                                              {
+                                                "title": "GenericOrganisationIdentification3",
+                                                "type": "object",
+                                                "description": "Information related to an identification of an organisation.\n",
+                                                "properties": {
+                                                  "Id": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "Max256Text",
+                                                        "description": "Specifies a character string with a maximum length of 256 characters.\n",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 256,
+                                                        "example": 256
+                                                      },
+                                                      {
+                                                        "description": "Identification\nIdentification assigned by an institution.\n"
+                                                      }
+                                                    ]
+                                                  },
+                                                  "SchmeNm": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "OrganisationIdentificationSchemeName1Choice",
+                                                        "description": "Choice of format for the organisation identification.\n",
+                                                        "type": "object",
+                                                        "properties": {
+                                                          "Cd": {
+                                                            "allOf": [
+                                                              {
+                                                                "title": "ExternalOrganisationIdentification1Code",
+                                                                "description": "Specifies the external organisation identification code.",
+                                                                "type": "string",
+                                                                "minLength": 1,
+                                                                "maxLength": 4,
+                                                                "example": 1234
+                                                              },
+                                                              {
+                                                                "description": "Code\nName of the identification scheme, in a coded form as published in an external list.\n"
+                                                              }
+                                                            ]
+                                                          },
+                                                          "Prtry": {
+                                                            "allOf": [
+                                                              {
+                                                                "title": "Max35Text",
+                                                                "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                                "type": "string",
+                                                                "minLength": 1,
+                                                                "maxLength": 35,
+                                                                "example": 1.234567890123457e+34
+                                                              },
+                                                              {
+                                                                "description": "Proprietary\nName of the identification scheme, in a free text form.\n"
+                                                              }
+                                                            ]
+                                                          }
+                                                        },
+                                                        "anyOf": [
+                                                          {
+                                                            "properties": {
+                                                              "Cd": {}
+                                                            }
+                                                          },
+                                                          {
+                                                            "properties": {
+                                                              "Prtry": {}
+                                                            }
+                                                          }
+                                                        ],
+                                                        "example": {
+                                                          "Cd": "BIC"
+                                                        }
+                                                      },
+                                                      {
+                                                        "description": "SchemeName\nName of the identification scheme.\n"
+                                                      }
+                                                    ]
+                                                  },
+                                                  "Issr": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "Max35Text",
+                                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 35,
+                                                        "example": 1.234567890123457e+34
+                                                      },
+                                                      {
+                                                        "description": "Issuer\nEntity that assigns the identification.\n"
+                                                      }
+                                                    ]
+                                                  }
+                                                },
+                                                "required": [
+                                                  "Id"
+                                                ],
+                                                "example": {
+                                                  "Id": 123,
+                                                  "SchmeNm": {
+                                                    "Cd": "BIC"
+                                                  },
+                                                  "Issr": "BIC"
+                                                }
+                                              },
+                                              {
+                                                "description": "Other\nUnique identification of an organisation, as assigned by an institution, using an identification scheme.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "example": {
+                                          "AnyBIC": "BICFI",
+                                          "LEI": "529900T8BM49AURSDO55",
+                                          "Othr": {
+                                            "Id": 123,
+                                            "SchmeNm": {
+                                              "Cd": "BIC"
+                                            },
+                                            "Issr": "BIC"
+                                          }
+                                        }
+                                      },
+                                      {
+                                        "description": "Organisation\nUnique and unambiguous way to identify an organisation.\n"
+                                      }
+                                    ]
+                                  }
+                                },
+                                "required": [
+                                  "OrgId"
+                                ]
+                              },
+                              {
+                                "properties": {
+                                  "PrvtId": {
+                                    "allOf": [
+                                      {
+                                        "title": "PersonIdentification18",
+                                        "description": "Unique and unambiguous way to identify a person.\n",
+                                        "type": "object",
+                                        "properties": {
+                                          "DtAndPlcOfBirth": {
+                                            "allOf": [
+                                              {
+                                                "title": "DateAndPlaceOfBirth1",
+                                                "description": "Details about date and place of birth of a person.\n",
+                                                "type": "object",
+                                                "properties": {
+                                                  "BirthDt": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "ISODate",
+                                                        "description": "A particular point in the progression of time in a calendar year expressed in the YYYY-MM-DD format. This representation is defined in \"XML Schema Part 2: Datatypes Second Edition - W3C Recommendation 28 October 2004\" which is aligned with ISO 8601.\n",
+                                                        "type": "string",
+                                                        "format": "date",
+                                                        "example": "2013-03-07"
+                                                      },
+                                                      {
+                                                        "description": "BirthDate\nDate on which a person was born.\n"
+                                                      }
+                                                    ]
+                                                  },
+                                                  "PrvcOfBirth": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "Max35Text",
+                                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 35,
+                                                        "example": 1.234567890123457e+34
+                                                      },
+                                                      {
+                                                        "description": "ProvinceOfBirth\nProvince where a person was born.\n"
+                                                      }
+                                                    ]
+                                                  },
+                                                  "CityOfBirth": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "Max35Text",
+                                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 35,
+                                                        "example": 1.234567890123457e+34
+                                                      },
+                                                      {
+                                                        "description": "CityOfBirth\nCity where a person was born.\n"
+                                                      }
+                                                    ]
+                                                  },
+                                                  "CtryOfBirth": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "CountryCode",
+                                                        "type": "string",
+                                                        "pattern": "^[A-Z]{2,2}$",
+                                                        "example": "US",
+                                                        "description": "Code to identify a country, a dependency, or another area of particular geopolitical interest, on the basis of country names obtained from the United Nations (ISO 3166, Alpha-2 code).\n"
+                                                      },
+                                                      {
+                                                        "description": "CountryOfBirth\nCountry where a person was born.\n"
+                                                      }
+                                                    ]
+                                                  }
+                                                },
+                                                "required": [
+                                                  "BirthDt",
+                                                  "CityOfBirth",
+                                                  "CtryOfBirth"
+                                                ],
+                                                "example": {
+                                                  "BirthDt": "1970-01-01",
+                                                  "PrvcOfBirth": "ON",
+                                                  "CityOfBirth": "Ottawa",
+                                                  "CtryOfBirth": "CA"
+                                                }
+                                              },
+                                              {
+                                                "description": "DateAndPlaceOfBirth\nDate and place of birth of a person.\n"
+                                              }
+                                            ]
+                                          },
+                                          "Othr": {
+                                            "allOf": [
+                                              {
+                                                "title": "GenericPersonIdentification2",
+                                                "type": "object",
+                                                "description": "Identification of a person.",
+                                                "properties": {
+                                                  "Id": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "Max256Text",
+                                                        "description": "Specifies a character string with a maximum length of 256 characters.\n",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 256,
+                                                        "example": 256
+                                                      },
+                                                      {
+                                                        "description": "Identification\nUnique and unambiguous identification of a person.\n"
+                                                      }
+                                                    ]
+                                                  },
+                                                  "SchmeNm": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "PersonIdentificationSchemeName1Choice",
+                                                        "description": "Sets of elements to identify a name of the identification scheme.\n",
+                                                        "type": "object",
+                                                        "anyOf": [
+                                                          {
+                                                            "properties": {
+                                                              "Cd": {
+                                                                "allOf": [
+                                                                  {
+                                                                    "title": "ExternalPersonIdentification1Code",
+                                                                    "description": "Specifies the external person identification code.",
+                                                                    "type": "string",
+                                                                    "minLength": 1,
+                                                                    "maxLength": 4,
+                                                                    "example": 1234
+                                                                  },
+                                                                  {
+                                                                    "description": "Code\nName of the identification scheme, in a coded form as published in an external list.\n"
+                                                                  }
+                                                                ]
+                                                              }
+                                                            },
+                                                            "required": [
+                                                              "Cd"
+                                                            ]
+                                                          },
+                                                          {
+                                                            "properties": {
+                                                              "Prtry": {
+                                                                "allOf": [
+                                                                  {
+                                                                    "title": "Max35Text",
+                                                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                                    "type": "string",
+                                                                    "minLength": 1,
+                                                                    "maxLength": 35,
+                                                                    "example": 1.234567890123457e+34
+                                                                  },
+                                                                  {
+                                                                    "description": "Proprietary\nName of the identification scheme, in a free text form.\n"
+                                                                  }
+                                                                ]
+                                                              }
+                                                            },
+                                                            "required": [
+                                                              "Prtry"
+                                                            ]
+                                                          }
+                                                        ],
+                                                        "example": {
+                                                          "Cd": "CCPT"
+                                                        }
+                                                      },
+                                                      {
+                                                        "description": "SchemeName\nName of the identification scheme.\n"
+                                                      }
+                                                    ]
+                                                  },
+                                                  "Issr": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "Max35Text",
+                                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 35,
+                                                        "example": 1.234567890123457e+34
+                                                      },
+                                                      {
+                                                        "description": "Issuer\nEntity that assigns the identification.\n"
+                                                      }
+                                                    ]
+                                                  }
+                                                },
+                                                "required": [
+                                                  "Id"
+                                                ],
+                                                "example": {
+                                                  "Id": 123,
+                                                  "SchmeNm": {
+                                                    "Cd": "DRLC"
+                                                  },
+                                                  "Issr": "BIC"
+                                                }
+                                              },
+                                              {
+                                                "description": "Other\nUnique identification of a person, as assigned by an institution, using an identification scheme.\n"
+                                              }
+                                            ]
+                                          }
+                                        },
+                                        "example": {
+                                          "DtAndPlcOfBirth": {
+                                            "Dt": "2018-01-01",
+                                            "CityOfBirth": "City"
+                                          },
+                                          "Othr": {
+                                            "Id": 123,
+                                            "SchmeNm": {
+                                              "Cd": "CUST",
+                                              "Prtry": 1
+                                            }
+                                          }
+                                        }
+                                      },
+                                      {
+                                        "description": "Person\nUnique and unambiguous identification of a person, for example a passport.\n"
+                                      }
+                                    ]
+                                  }
+                                },
+                                "required": [
+                                  "PrvtId"
+                                ]
+                              }
+                            ],
+                            "example": {
+                              "OrgId": {
+                                "AnyBIC": "BIC"
+                              },
+                              "PrvtId": {
+                                "DtAndPlcOfBirth": {
+                                  "Dt": "2018-01-01",
+                                  "CityOfBirth": "City"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "description": "Identification\nUnique and unambiguous identification of a party.\n"
+                          }
+                        ]
+                      },
+                      "CtryOfRes": {
+                        "allOf": [
+                          {
+                            "title": "CountryCode",
+                            "type": "string",
+                            "pattern": "^[A-Z]{2,2}$",
+                            "example": "US",
+                            "description": "Code to identify a country, a dependency, or another area of particular geopolitical interest, on the basis of country names obtained from the United Nations (ISO 3166, Alpha-2 code).\n"
+                          },
+                          {
+                            "description": "Country of Residence\nCountry in which a person resides (the place of a person's home). In the case of a company, it is the country from which the affairs of that company are directed.\n"
+                          }
+                        ]
+                      },
+                      "CtctDtls": {
+                        "allOf": [
+                          {
+                            "title": "Contact13",
+                            "description": "Specifies the details of the contact person.\n",
+                            "type": "object",
+                            "properties": {
+                              "NmPrfx": {
+                                "allOf": [
+                                  {
+                                    "description": "Specifies the terms used to formally address a person.\n\nDOCT: Doctor or Dr\nMADM: Madam\nMISS: Miss\nMIST: Mistress\nMIKS: Mx\n",
+                                    "enum": [
+                                      "DOCT",
+                                      "MADM",
+                                      "MISS",
+                                      "MIST",
+                                      "MIKS"
+                                    ],
+                                    "type": "string",
+                                    "example": "DOCT"
+                                  },
+                                  {
+                                    "description": "NamePrefix\nSpecifies the terms used to formally address a person.\n"
+                                  }
+                                ]
+                              },
+                              "Nm": {
+                                "allOf": [
+                                  {
+                                    "title": "Max140Text",
+                                    "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 140,
+                                    "example": 12345
+                                  },
+                                  {
+                                    "description": "Name\nName by which a party is known and which is usually used to identify that party.\n"
+                                  }
+                                ]
+                              },
+                              "PhneNb": {
+                                "allOf": [
+                                  {
+                                    "title": "PhoneNumber",
+                                    "type": "string",
+                                    "description": "Double check this regex.\n",
+                                    "pattern": "^\\+[0-9]{1,3}-[0-9()+\\-]{1,30}$"
+                                  },
+                                  {
+                                    "description": "PhoneNumber\nCollection of information that identifies a phone number, as defined by telecom services.\n"
+                                  }
+                                ]
+                              },
+                              "MobNb": {
+                                "allOf": [
+                                  {
+                                    "title": "PhoneNumber",
+                                    "type": "string",
+                                    "description": "Double check this regex.\n",
+                                    "pattern": "^\\+[0-9]{1,3}-[0-9()+\\-]{1,30}$"
+                                  },
+                                  {
+                                    "description": "MobilePhoneNumber\nCollection of information that identifies a mobile phone number, as defined by telecom services.\n"
+                                  }
+                                ]
+                              },
+                              "FaxNb": {
+                                "allOf": [
+                                  {
+                                    "title": "PhoneNumber",
+                                    "type": "string",
+                                    "description": "Double check this regex.\n",
+                                    "pattern": "^\\+[0-9]{1,3}-[0-9()+\\-]{1,30}$"
+                                  },
+                                  {
+                                    "description": "FaxNumber\nCollection of information that identifies a fax number, as defined by telecom services.\n"
+                                  }
+                                ]
+                              },
+                              "URLAdr": {
+                                "allOf": [
+                                  {
+                                    "title": "Max2048Text",
+                                    "description": "Specifies a character string with a maximum length of 2048 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 2048,
+                                    "example": 2048
+                                  },
+                                  {
+                                    "description": "URLAddress\nAddress for the Universal Resource Locator (URL), for example an address used over the www (HTTP) service.\n"
+                                  }
+                                ]
+                              },
+                              "EmailAdr": {
+                                "allOf": [
+                                  {
+                                    "title": "Max256Text",
+                                    "description": "Specifies a character string with a maximum length of 256 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 256,
+                                    "example": 256
+                                  },
+                                  {
+                                    "description": "EmailAddress\nAddress for electronic mail (e-mail).\n"
+                                  }
+                                ]
+                              },
+                              "EmailPurp": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "EmailPurpose\nPurpose for which an email address may be used.\n"
+                                  }
+                                ]
+                              },
+                              "JobTitl": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "JobTitle\nTitle of the function.\n"
+                                  }
+                                ]
+                              },
+                              "Rspnsblty": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "Responsibility\nRole of a person in an organisation.\n"
+                                  }
+                                ]
+                              },
+                              "Dept": {
+                                "allOf": [
+                                  {
+                                    "title": "Max70Text",
+                                    "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 70,
+                                    "example": 1.2345678901234567e+99
+                                  },
+                                  {
+                                    "description": "Department\nIdentification of a division of a large organisation or building.\n"
+                                  }
+                                ]
+                              },
+                              "Othr": {
+                                "allOf": [
+                                  {
+                                    "title": "OtherContact1",
+                                    "description": "Communication device number or electronic address used for communication.\n",
+                                    "type": "object",
+                                    "properties": {
+                                      "ChanlTp": {
+                                        "allOf": [
+                                          {
+                                            "title": "Max4Text",
+                                            "description": "Specifies a character string with a maximum length of 4 characters.\n",
+                                            "type": "string",
+                                            "minLength": 1,
+                                            "maxLength": 4,
+                                            "example": 1234
+                                          },
+                                          {
+                                            "description": "ChannelType\nMethod used to contact the financial institution's contact for the specific tax region.\n"
+                                          }
+                                        ]
+                                      },
+                                      "Id": {
+                                        "allOf": [
+                                          {
+                                            "title": "Max128Text",
+                                            "description": "Specifies a character string with a maximum length of 128 characters.\n",
+                                            "type": "string",
+                                            "minLength": 1,
+                                            "maxLength": 128,
+                                            "example": 12345
+                                          },
+                                          {
+                                            "description": "Identifier\nCommunication value such as phone number or email address.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "ChanlTp"
+                                    ],
+                                    "example": {
+                                      "ChanlTp": "PHON",
+                                      "Id": 1234567890
+                                    }
+                                  },
+                                  {
+                                    "description": "OtherContact\nContact details in another form.\n"
+                                  }
+                                ]
+                              },
+                              "PrefrdMtd": {
+                                "allOf": [
+                                  {
+                                    "title": "PreferredContactMethod2Code",
+                                    "description": "Preferred method used to reach the individual contact within an organisation.\nLETT: Letter\nMAIL: Email\nPHON: Phone\nFAXX: Fax\nCELL: Mobile phone\n",
+                                    "type": "string",
+                                    "enum": [
+                                      "LETT",
+                                      "MAIL",
+                                      "PHON",
+                                      "FAXX",
+                                      "CELL"
+                                    ],
+                                    "example": "MAIL"
+                                  },
+                                  {
+                                    "description": "PreferredContactMethod\nPreferred method used to reach the contact.\n"
+                                  }
+                                ]
+                              }
+                            },
+                            "example": {
+                              "NmPrfx": "Mr",
+                              "Nm": "John Doe",
+                              "PhneNb": "+123-123-321",
+                              "MobNb": "+123-123-321",
+                              "FaxNb": "+123-123-321",
+                              "URLAdr": "http://www.example.com",
+                              "EmailAdr": "example@example.com"
+                            }
+                          },
+                          {
+                            "description": "Contact Details\nSet of elements used to indicate how to contact the party.\n"
+                          }
+                        ]
+                      }
+                    },
+                    "required": [
+                      "Id"
+                    ],
+                    "example": {
+                      "Nm": "John Doe",
+                      "PstlAdr": {
+                        "AdrTp": "ADDR",
+                        "Dept": "Dept",
+                        "SubDept": "SubDept",
+                        "StrtNm": "StrtNm",
+                        "BldgNb": "BldgNb",
+                        "PstCd": "PstCd",
+                        "TwnNm": "TwnNm",
+                        "CtrySubDvsn": "CtrySubDvsn",
+                        "Ctry": "Ctry"
+                      },
+                      "Id": {
+                        "OrgId": {
+                          "AnyBIC": "BIC"
+                        },
+                        "PrvtId": {
+                          "DtAndPlcOfBirth": {
+                            "Dt": "2018-01-01",
+                            "CityOfBirth": "City"
+                          }
+                        }
+                      },
+                      "CtryOfRes": "BE",
+                      "CtctDtls": {
+                        "NmPrfx": "Mr",
+                        "Nm": "John Doe",
+                        "PhneNb": "+123-123-321",
+                        "MobNb": "+123-123-321",
+                        "FaxNb": "+123-123-321",
+                        "EmailAdr": "example@example.com"
+                      }
+                    }
+                  },
+                  {
+                    "description": "Party to which an amount of money is due.\n"
+                  }
+                ]
+              },
+              "DbtrAgt": {
+                "allOf": [
+                  {
+                    "title": "BranchAndFinancialInstitutionIdentification8",
+                    "type": "object",
+                    "description": "Unique and unambiguous identification of a financial institution or a branch of a financial institution.\n",
+                    "properties": {
+                      "FinInstnId": {
+                        "allOf": [
+                          {
+                            "title": "FinancialInstitutionIdentification23",
+                            "type": "object",
+                            "description": "Information used to identify a financial institution.\n",
+                            "properties": {
+                              "BICFI": {
+                                "allOf": [
+                                  {
+                                    "title": "BICFIDec2014Identifier",
+                                    "type": "string",
+                                    "description": "Code allocated to a financial institution by the ISO 9362 Registration\n\nAuthority as described in ISO 9362: 2014\n\n- \"Banking - Banking telecommunication messages - Business identifier code (BIC)\".\n",
+                                    "pattern": "^[A-Z0-9]{4,4}[A-Z]{2,2}[A-Z0-9]{2,2}([A-Z0-9]{3,3}){0,1}$",
+                                    "example": "J5BMVH7D"
+                                  },
+                                  {
+                                    "description": "BICFI\nCode allocated to a financial institution by the ISO 9362 Registration Authority as described in ISO 9362 \"Banking - Banking telecommunication messages - Business identifier code (BIC)\"\n"
+                                  }
+                                ]
+                              },
+                              "ClrSysMmbId": {
+                                "allOf": [
+                                  {
+                                    "title": "ClearingSystemMemberIdentification2",
+                                    "description": "Unique identification, as assigned by a clearing system, to unambiguously identify a member of the clearing system.\n",
+                                    "type": "object",
+                                    "properties": {
+                                      "ClrSysId": {
+                                        "allOf": [
+                                          {
+                                            "title": "ClearingSystemIdentification2Choice",
+                                            "description": "Specifies the clearing system identification.\n",
+                                            "type": "object",
+                                            "anyOf": [
+                                              {
+                                                "properties": {
+                                                  "Cd": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "ExternalClearingSystemIdentification1Code",
+                                                        "description": "Specifies the external clearing system identification code.\n",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 5,
+                                                        "example": 12345
+                                                      },
+                                                      {
+                                                        "description": "Code\nClearing system identification code, as published in an external list.\n"
+                                                      }
+                                                    ]
+                                                  }
+                                                },
+                                                "required": [
+                                                  "Cd"
+                                                ]
+                                              },
+                                              {
+                                                "properties": {
+                                                  "Prtry": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "Max35Text",
+                                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 35,
+                                                        "example": 1.234567890123457e+34
+                                                      },
+                                                      {
+                                                        "description": "Proprietary\nProprietary identification of the clearing system.\n"
+                                                      }
+                                                    ]
+                                                  }
+                                                },
+                                                "required": [
+                                                  "Prtry"
+                                                ]
+                                              }
+                                            ],
+                                            "example": {
+                                              "Cd": "CHIPS"
+                                            }
+                                          },
+                                          {
+                                            "description": "ClearingSystemIdentification\nSpecification of a pre-agreed offering between clearing agents or the channel through which the payment instruction is processed.\n"
+                                          }
+                                        ]
+                                      },
+                                      "MmbId": {
+                                        "allOf": [
+                                          {
+                                            "title": "Max35Text",
+                                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                            "type": "string",
+                                            "minLength": 1,
+                                            "maxLength": 35,
+                                            "example": 1.234567890123457e+34
+                                          },
+                                          {
+                                            "description": "MemberIdentification\nIdentification of a member of a clearing system.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "MmbId"
+                                    ],
+                                    "example": {
+                                      "ClrSysId": {
+                                        "Cd": "CHQB"
+                                      },
+                                      "MmbId": 123456789
+                                    }
+                                  },
+                                  {
+                                    "description": "ClearingSystemMemberIdentification\nInformation used to identify a member within a clearing system\n"
+                                  }
+                                ]
+                              },
+                              "LEI": {
+                                "allOf": [
+                                  {
+                                    "title": "LEIIdentifier",
+                                    "description": "Legal Entity Identifier is a code allocated to a party as described in ISO 17442 \"Financial Services - Legal Entity Identifier (LEI)\". ^([0-9A-Z]{18,18}[0-9]{2,2})$\n",
+                                    "type": "string",
+                                    "pattern": "^[A-Z0-9]{18,18}[0-9]{2,2}$",
+                                    "example": "529900T8BM49AURSDO55"
+                                  },
+                                  {
+                                    "description": "LEI\nLegal entity identifier of the financial institution.\n"
+                                  }
+                                ]
+                              },
+                              "Nm": {
+                                "allOf": [
+                                  {
+                                    "title": "Max140Text",
+                                    "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 140,
+                                    "example": 12345
+                                  },
+                                  {
+                                    "description": "Name\nName by which an agent is known and which is usually used to identify that agent\n"
+                                  }
+                                ]
+                              },
+                              "PstlAdr": {
+                                "allOf": [
+                                  {
+                                    "title": "PostalAddress24",
+                                    "type": "object",
+                                    "description": "Information that locates and identifies a specific address, as defined by postal services.\n",
+                                    "properties": {
+                                      "AdrTp": {
+                                        "title": "AddressType3Choice",
+                                        "type": "object",
+                                        "description": "Choice of formats for the type of address.\n",
+                                        "anyOf": [
+                                          {
+                                            "properties": {
+                                              "Cd": {
+                                                "allOf": [
+                                                  {
+                                                    "description": "AddressType2Code\nSpecifies the type of address.\nADDR Address\nPBOX PostBox\nHOME Home\nBIZZ Business\nMLTO MailingTo\nDLVY Delivery\n",
+                                                    "enum": [
+                                                      "ADDR",
+                                                      "PBOX",
+                                                      "HOME",
+                                                      "BIZZ",
+                                                      "MLTO",
+                                                      "DLVY"
+                                                    ],
+                                                    "type": "string",
+                                                    "example": "ADDR"
+                                                  },
+                                                  {
+                                                    "description": "Code\nType of address expressed as a code.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Cd"
+                                            ]
+                                          },
+                                          {
+                                            "properties": {
+                                              "Prtry": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "GenericIdentification30",
+                                                    "type": "object",
+                                                    "description": "Generic scheme identification for a party.\n",
+                                                    "properties": {
+                                                      "Id": {
+                                                        "allOf": [
+                                                          {
+                                                            "title": "Exact4AlphaNumericText",
+                                                            "description": "Specifies an alphanumeric string with a length of 4 characters.\n",
+                                                            "type": "string",
+                                                            "pattern": "^[a-zA-Z0-9]{4}$",
+                                                            "example": 1234
+                                                          },
+                                                          {
+                                                            "description": "Identification\nProprietary information, often a code, issued by the data source scheme issuer.\n"
+                                                          }
+                                                        ]
+                                                      },
+                                                      "Issr": {
+                                                        "allOf": [
+                                                          {
+                                                            "title": "Max35Text",
+                                                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                            "type": "string",
+                                                            "minLength": 1,
+                                                            "maxLength": 35,
+                                                            "example": 1.234567890123457e+34
+                                                          },
+                                                          {
+                                                            "description": "Issuer\nEntity that assigns the identification.\n"
+                                                          }
+                                                        ]
+                                                      },
+                                                      "SchmeNm": {
+                                                        "allOf": [
+                                                          {
+                                                            "title": "Max35Text",
+                                                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                            "type": "string",
+                                                            "minLength": 1,
+                                                            "maxLength": 35,
+                                                            "example": 1.234567890123457e+34
+                                                          },
+                                                          {
+                                                            "description": "SchemeName\nShort textual description of the scheme.\n"
+                                                          }
+                                                        ]
+                                                      }
+                                                    },
+                                                    "required": [
+                                                      "Id",
+                                                      "Issr"
+                                                    ],
+                                                    "example": {
+                                                      "Id": 1234,
+                                                      "Issr": "BIC",
+                                                      "SchmeNm": "BICFI"
+                                                    }
+                                                  },
+                                                  {
+                                                    "description": "Proprietary\nType of address expressed as a proprietary code.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Prtry"
+                                            ]
+                                          }
+                                        ],
+                                        "example": {
+                                          "Cd": "ADDR"
+                                        }
+                                      },
+                                      "Dept": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      },
+                                      "SubDept": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      },
+                                      "StrtNm": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      },
+                                      "BldgNb": {
+                                        "title": "Max16Text",
+                                        "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 16,
+                                        "example": 1234567890123456
+                                      },
+                                      "BldgNm": {
+                                        "title": "Max35Text",
+                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 35,
+                                        "example": 1.234567890123457e+34
+                                      },
+                                      "Flr": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      },
+                                      "PstBx": {
+                                        "title": "Max16Text",
+                                        "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 16,
+                                        "example": 1234567890123456
+                                      },
+                                      "Room": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      },
+                                      "PstCd": {
+                                        "title": "Max16Text",
+                                        "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 16,
+                                        "example": 1234567890123456
+                                      },
+                                      "TwnNm": {
+                                        "title": "Max35Text",
+                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 35,
+                                        "example": 1.234567890123457e+34
+                                      },
+                                      "TwnLctnNm": {
+                                        "title": "Max35Text",
+                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 35,
+                                        "example": 1.234567890123457e+34
+                                      },
+                                      "DstrctNm": {
+                                        "title": "Max35Text",
+                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 35,
+                                        "example": 1.234567890123457e+34
+                                      },
+                                      "CtrySubDvsn": {
+                                        "title": "Max35Text",
+                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 35,
+                                        "example": 1.234567890123457e+34
+                                      },
+                                      "Ctry": {
+                                        "title": "CountryCode",
+                                        "type": "string",
+                                        "pattern": "^[A-Z]{2,2}$",
+                                        "example": "US",
+                                        "description": "Code to identify a country, a dependency, or another area of particular geopolitical interest, on the basis of country names obtained from the United Nations (ISO 3166, Alpha-2 code).\n"
+                                      },
+                                      "AdrLine": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      }
+                                    },
+                                    "example": {
+                                      "AdrTp": "ADDR",
+                                      "Dept": "Dept",
+                                      "SubDept": "SubDept",
+                                      "StrtNm": "StrtNm",
+                                      "BldgNb": "BldgNb",
+                                      "BldgNm": "BldgNm",
+                                      "Flr": "Flr",
+                                      "PstBx": "PstBx",
+                                      "Room": "Room",
+                                      "PstCd": "PstCd",
+                                      "TwnNm": "TwnNm",
+                                      "TwnLctnNm": "TwnLctnNm",
+                                      "DstrctNm": "DstrctNm",
+                                      "CtrySubDvsn": "CtrySubDvsn",
+                                      "Ctry": "Ctry",
+                                      "AdrLine": "AdrLine"
+                                    }
+                                  },
+                                  {
+                                    "description": "PostalAddress\nInformation that locates and identifies a specific address, as defined by postal services.\n"
+                                  }
+                                ]
+                              },
+                              "Othr": {
+                                "allOf": [
+                                  {
+                                    "title": "GenericFinancialIdentification1",
+                                    "type": "object",
+                                    "description": "GenericFinancialIdentification\nUnique and unambiguous identification of a person, which is used to refer to a person in a financial context.\n",
+                                    "properties": {
+                                      "Id": {
+                                        "allOf": [
+                                          {
+                                            "title": "Max35Text",
+                                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                            "type": "string",
+                                            "minLength": 1,
+                                            "maxLength": 35,
+                                            "example": 1.234567890123457e+34
+                                          },
+                                          {
+                                            "description": "Identification\nUnique and unambiguous identification of a person.\n"
+                                          }
+                                        ]
+                                      },
+                                      "SchmeNm": {
+                                        "allOf": [
+                                          {
+                                            "title": "FinancialIdentificationSchemeName1Choice",
+                                            "type": "object",
+                                            "description": "Specifies the name of the identification scheme.\n",
+                                            "anyOf": [
+                                              {
+                                                "properties": {
+                                                  "Cd": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "ExternalFinancialInstitutionIdentification1Code",
+                                                        "description": "Specifies the external financial institution identification code.",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 4,
+                                                        "example": 1234
+                                                      },
+                                                      {
+                                                        "description": "Code\nName of the identification scheme, in a coded form as published in an external list.\n"
+                                                      }
+                                                    ]
+                                                  }
+                                                },
+                                                "required": [
+                                                  "Cd"
+                                                ]
+                                              },
+                                              {
+                                                "properties": {
+                                                  "Prtry": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "Max35Text",
+                                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 35,
+                                                        "example": 1.234567890123457e+34
+                                                      },
+                                                      {
+                                                        "description": "Proprietary\nName of the identification scheme, in a free text form.\n"
+                                                      }
+                                                    ]
+                                                  }
+                                                },
+                                                "required": [
+                                                  "Prtry"
+                                                ]
+                                              }
+                                            ],
+                                            "example": {
+                                              "Cd": "BIC"
+                                            }
+                                          },
+                                          {
+                                            "description": "SchemeName\nName of the identification scheme.\n"
+                                          }
+                                        ]
+                                      },
+                                      "Issr": {
+                                        "allOf": [
+                                          {
+                                            "title": "Max35Text",
+                                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                            "type": "string",
+                                            "minLength": 1,
+                                            "maxLength": 35,
+                                            "example": 1.234567890123457e+34
+                                          },
+                                          {
+                                            "description": "Issuer\nEntity that assigns the identification.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Id"
+                                    ],
+                                    "example": {
+                                      "Id": 123,
+                                      "SchmeNm": {
+                                        "Cd": "IBAN"
+                                      },
+                                      "Issr": "BIC"
+                                    }
+                                  },
+                                  {
+                                    "description": "Other\nUnique identification of an agent, as assigned by an institution, using an identification scheme.\n"
+                                  }
+                                ]
+                              }
+                            },
+                            "required": [],
+                            "example": {
+                              "BICFI": "J5BMVH7D",
+                              "ClrSysMmbId": {
+                                "ClrSysId": 1234,
+                                "MmbId": 123
+                              },
+                              "LEI": 123,
+                              "Nm": "Name",
+                              "PstlAdr": {
+                                "AdrTp": "ADDR",
+                                "Dept": "Department",
+                                "SubDept": "Sub department",
+                                "StrtNm": "Street name",
+                                "BldgNb": "Building number",
+                                "PstCd": "Post code",
+                                "TwnNm": "Town name",
+                                "CtrySubDvsn": "Country subdivision",
+                                "Ctry": "Country",
+                                "AdrLine": "Address line"
+                              },
+                              "Othr": {
+                                "Id": 123,
+                                "SchmeNm": {
+                                  "Cd": 123,
+                                  "Prtry": 123
+                                },
+                                "Issr": 123
+                              }
+                            }
+                          },
+                          {
+                            "description": "FinancialInstitutionIdentification\nUnique and unambiguous identification of a financial institution or a branch of a financial institution.\n"
+                          }
+                        ]
+                      },
+                      "BrnchId": {
+                        "allOf": [
+                          {
+                            "title": "BranchData5",
+                            "description": "Information that locates and identifies a specific branch of a financial institution.\n",
+                            "type": "object",
+                            "properties": {
+                              "Id": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "Identification\nUnique and unambiguous identification of a branch of a financial institution.\n"
+                                  }
+                                ]
+                              },
+                              "LEI": {
+                                "allOf": [
+                                  {
+                                    "title": "LEIIdentifier",
+                                    "description": "Legal Entity Identifier is a code allocated to a party as described in ISO 17442 \"Financial Services - Legal Entity Identifier (LEI)\". ^([0-9A-Z]{18,18}[0-9]{2,2})$\n",
+                                    "type": "string",
+                                    "pattern": "^[A-Z0-9]{18,18}[0-9]{2,2}$",
+                                    "example": "529900T8BM49AURSDO55"
+                                  },
+                                  {
+                                    "description": "LEI\nLegal entity identification for the branch of the financial institution.\n"
+                                  }
+                                ]
+                              },
+                              "Nm": {
+                                "allOf": [
+                                  {
+                                    "title": "Max140Text",
+                                    "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 140,
+                                    "example": 12345
+                                  },
+                                  {
+                                    "description": "Name\nName by which an agent is known and which is usually used to identify that agent.\n"
+                                  }
+                                ]
+                              },
+                              "PstlAdr": {
+                                "allOf": [
+                                  {
+                                    "title": "PostalAddress27",
+                                    "type": "object",
+                                    "description": "Information that locates and identifies a specific address, as defined by postal services.\n",
+                                    "properties": {
+                                      "AdrTp": {
+                                        "title": "AddressType3Choice",
+                                        "type": "object",
+                                        "description": "Choice of formats for the type of address.\n",
+                                        "anyOf": [
+                                          {
+                                            "properties": {
+                                              "Cd": {
+                                                "allOf": [
+                                                  {
+                                                    "description": "AddressType2Code\nSpecifies the type of address.\nADDR Address\nPBOX PostBox\nHOME Home\nBIZZ Business\nMLTO MailingTo\nDLVY Delivery\n",
+                                                    "enum": [
+                                                      "ADDR",
+                                                      "PBOX",
+                                                      "HOME",
+                                                      "BIZZ",
+                                                      "MLTO",
+                                                      "DLVY"
+                                                    ],
+                                                    "type": "string",
+                                                    "example": "ADDR"
+                                                  },
+                                                  {
+                                                    "description": "Code\nType of address expressed as a code.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Cd"
+                                            ]
+                                          },
+                                          {
+                                            "properties": {
+                                              "Prtry": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "GenericIdentification30",
+                                                    "type": "object",
+                                                    "description": "Generic scheme identification for a party.\n",
+                                                    "properties": {
+                                                      "Id": {
+                                                        "allOf": [
+                                                          {
+                                                            "title": "Exact4AlphaNumericText",
+                                                            "description": "Specifies an alphanumeric string with a length of 4 characters.\n",
+                                                            "type": "string",
+                                                            "pattern": "^[a-zA-Z0-9]{4}$",
+                                                            "example": 1234
+                                                          },
+                                                          {
+                                                            "description": "Identification\nProprietary information, often a code, issued by the data source scheme issuer.\n"
+                                                          }
+                                                        ]
+                                                      },
+                                                      "Issr": {
+                                                        "allOf": [
+                                                          {
+                                                            "title": "Max35Text",
+                                                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                            "type": "string",
+                                                            "minLength": 1,
+                                                            "maxLength": 35,
+                                                            "example": 1.234567890123457e+34
+                                                          },
+                                                          {
+                                                            "description": "Issuer\nEntity that assigns the identification.\n"
+                                                          }
+                                                        ]
+                                                      },
+                                                      "SchmeNm": {
+                                                        "allOf": [
+                                                          {
+                                                            "title": "Max35Text",
+                                                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                            "type": "string",
+                                                            "minLength": 1,
+                                                            "maxLength": 35,
+                                                            "example": 1.234567890123457e+34
+                                                          },
+                                                          {
+                                                            "description": "SchemeName\nShort textual description of the scheme.\n"
+                                                          }
+                                                        ]
+                                                      }
+                                                    },
+                                                    "required": [
+                                                      "Id",
+                                                      "Issr"
+                                                    ],
+                                                    "example": {
+                                                      "Id": 1234,
+                                                      "Issr": "BIC",
+                                                      "SchmeNm": "BICFI"
+                                                    }
+                                                  },
+                                                  {
+                                                    "description": "Proprietary\nType of address expressed as a proprietary code.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Prtry"
+                                            ]
+                                          }
+                                        ],
+                                        "example": {
+                                          "Cd": "ADDR"
+                                        }
+                                      },
+                                      "CareOf": {
+                                        "title": "Max140Text",
+                                        "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 140,
+                                        "example": 12345
+                                      },
+                                      "Dept": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      },
+                                      "SubDept": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      },
+                                      "StrtNm": {
+                                        "title": "Max140Text",
+                                        "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 140,
+                                        "example": 12345
+                                      },
+                                      "BldgNb": {
+                                        "title": "Max16Text",
+                                        "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 16,
+                                        "example": 1234567890123456
+                                      },
+                                      "BldgNm": {
+                                        "title": "Max140Text",
+                                        "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 140,
+                                        "example": 12345
+                                      },
+                                      "Flr": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      },
+                                      "UnitNb": {
+                                        "title": "Max16Text",
+                                        "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 16,
+                                        "example": 1234567890123456
+                                      },
+                                      "PstBx": {
+                                        "title": "Max16Text",
+                                        "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 16,
+                                        "example": 1234567890123456
+                                      },
+                                      "Room": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      },
+                                      "PstCd": {
+                                        "title": "Max16Text",
+                                        "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 16,
+                                        "example": 1234567890123456
+                                      },
+                                      "TwnNm": {
+                                        "title": "Max140Text",
+                                        "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 140,
+                                        "example": 12345
+                                      },
+                                      "TwnLctnNm": {
+                                        "title": "Max140Text",
+                                        "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 140,
+                                        "example": 12345
+                                      },
+                                      "DstrctNm": {
+                                        "title": "Max140Text",
+                                        "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 140,
+                                        "example": 12345
+                                      },
+                                      "CtrySubDvsn": {
+                                        "title": "Max35Text",
+                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 35,
+                                        "example": 1.234567890123457e+34
+                                      },
+                                      "Ctry": {
+                                        "title": "CountryCode",
+                                        "type": "string",
+                                        "pattern": "^[A-Z]{2,2}$",
+                                        "example": "US",
+                                        "description": "Code to identify a country, a dependency, or another area of particular geopolitical interest, on the basis of country names obtained from the United Nations (ISO 3166, Alpha-2 code).\n"
+                                      },
+                                      "AdrLine": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      }
+                                    },
+                                    "example": {
+                                      "AdrTp": "ADDR",
+                                      "CareOf": "CareOf",
+                                      "Dept": "Dept",
+                                      "SubDept": "SubDept",
+                                      "StrtNm": "StrtNm",
+                                      "BldgNb": "BldgNb",
+                                      "BldgNm": "BldgNm",
+                                      "Flr": "Flr",
+                                      "UnitNb": "UnitNb",
+                                      "PstBx": "PstBx",
+                                      "Room": "Room",
+                                      "PstCd": "PstCd",
+                                      "TwnNm": "TwnNm",
+                                      "TwnLctnNm": "TwnLctnNm",
+                                      "DstrctNm": "DstrctNm",
+                                      "CtrySubDvsn": "CtrySubDvsn",
+                                      "Ctry": "Ctry",
+                                      "AdrLine": "AdrLine"
+                                    }
+                                  },
+                                  {
+                                    "description": "PostalAddress\nInformation that locates and identifies a specific address, as defined by postal services.\n"
+                                  }
+                                ]
+                              }
+                            },
+                            "example": {
+                              "Id": 123,
+                              "LEI": 123,
+                              "Nm": "Name",
+                              "PstlAdr": {
+                                "AdrTp": "ADDR",
+                                "Dept": "Department",
+                                "SubDept": "Sub department",
+                                "StrtNm": "Street name",
+                                "BldgNb": "Building number"
+                              }
+                            }
+                          },
+                          {
+                            "description": "BranchIdentification\nIdentifies a specific branch of a financial institution.\n"
+                          }
+                        ]
+                      }
+                    },
+                    "required": [
+                      "FinInstnId"
+                    ],
+                    "example": {
+                      "FinInstnId": {
+                        "BICFI": "J5BMVH7D"
+                      },
+                      "BrnchId": {
+                        "Id": 123,
+                        "Nm": "Name",
+                        "PstlAdr": {
+                          "AdrTp": "ADDR",
+                          "Dept": "Department",
+                          "SubDept": "Sub department",
+                          "StrtNm": "Street name",
+                          "BldgNb": "Building number",
+                          "PstCd": "Post code",
+                          "TwnNm": "Town name",
+                          "CtrySubDvsn": "Country subdivision",
+                          "Ctry": "Country",
+                          "AdrLine": "Address line"
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "description": "Financial institution servicing an account for the debtor.\n"
+                  }
+                ]
+              },
+              "CdtrAgt": {
+                "allOf": [
+                  {
+                    "title": "BranchAndFinancialInstitutionIdentification8",
+                    "type": "object",
+                    "description": "Unique and unambiguous identification of a financial institution or a branch of a financial institution.\n",
+                    "properties": {
+                      "FinInstnId": {
+                        "allOf": [
+                          {
+                            "title": "FinancialInstitutionIdentification23",
+                            "type": "object",
+                            "description": "Information used to identify a financial institution.\n",
+                            "properties": {
+                              "BICFI": {
+                                "allOf": [
+                                  {
+                                    "title": "BICFIDec2014Identifier",
+                                    "type": "string",
+                                    "description": "Code allocated to a financial institution by the ISO 9362 Registration\n\nAuthority as described in ISO 9362: 2014\n\n- \"Banking - Banking telecommunication messages - Business identifier code (BIC)\".\n",
+                                    "pattern": "^[A-Z0-9]{4,4}[A-Z]{2,2}[A-Z0-9]{2,2}([A-Z0-9]{3,3}){0,1}$",
+                                    "example": "J5BMVH7D"
+                                  },
+                                  {
+                                    "description": "BICFI\nCode allocated to a financial institution by the ISO 9362 Registration Authority as described in ISO 9362 \"Banking - Banking telecommunication messages - Business identifier code (BIC)\"\n"
+                                  }
+                                ]
+                              },
+                              "ClrSysMmbId": {
+                                "allOf": [
+                                  {
+                                    "title": "ClearingSystemMemberIdentification2",
+                                    "description": "Unique identification, as assigned by a clearing system, to unambiguously identify a member of the clearing system.\n",
+                                    "type": "object",
+                                    "properties": {
+                                      "ClrSysId": {
+                                        "allOf": [
+                                          {
+                                            "title": "ClearingSystemIdentification2Choice",
+                                            "description": "Specifies the clearing system identification.\n",
+                                            "type": "object",
+                                            "anyOf": [
+                                              {
+                                                "properties": {
+                                                  "Cd": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "ExternalClearingSystemIdentification1Code",
+                                                        "description": "Specifies the external clearing system identification code.\n",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 5,
+                                                        "example": 12345
+                                                      },
+                                                      {
+                                                        "description": "Code\nClearing system identification code, as published in an external list.\n"
+                                                      }
+                                                    ]
+                                                  }
+                                                },
+                                                "required": [
+                                                  "Cd"
+                                                ]
+                                              },
+                                              {
+                                                "properties": {
+                                                  "Prtry": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "Max35Text",
+                                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 35,
+                                                        "example": 1.234567890123457e+34
+                                                      },
+                                                      {
+                                                        "description": "Proprietary\nProprietary identification of the clearing system.\n"
+                                                      }
+                                                    ]
+                                                  }
+                                                },
+                                                "required": [
+                                                  "Prtry"
+                                                ]
+                                              }
+                                            ],
+                                            "example": {
+                                              "Cd": "CHIPS"
+                                            }
+                                          },
+                                          {
+                                            "description": "ClearingSystemIdentification\nSpecification of a pre-agreed offering between clearing agents or the channel through which the payment instruction is processed.\n"
+                                          }
+                                        ]
+                                      },
+                                      "MmbId": {
+                                        "allOf": [
+                                          {
+                                            "title": "Max35Text",
+                                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                            "type": "string",
+                                            "minLength": 1,
+                                            "maxLength": 35,
+                                            "example": 1.234567890123457e+34
+                                          },
+                                          {
+                                            "description": "MemberIdentification\nIdentification of a member of a clearing system.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "MmbId"
+                                    ],
+                                    "example": {
+                                      "ClrSysId": {
+                                        "Cd": "CHQB"
+                                      },
+                                      "MmbId": 123456789
+                                    }
+                                  },
+                                  {
+                                    "description": "ClearingSystemMemberIdentification\nInformation used to identify a member within a clearing system\n"
+                                  }
+                                ]
+                              },
+                              "LEI": {
+                                "allOf": [
+                                  {
+                                    "title": "LEIIdentifier",
+                                    "description": "Legal Entity Identifier is a code allocated to a party as described in ISO 17442 \"Financial Services - Legal Entity Identifier (LEI)\". ^([0-9A-Z]{18,18}[0-9]{2,2})$\n",
+                                    "type": "string",
+                                    "pattern": "^[A-Z0-9]{18,18}[0-9]{2,2}$",
+                                    "example": "529900T8BM49AURSDO55"
+                                  },
+                                  {
+                                    "description": "LEI\nLegal entity identifier of the financial institution.\n"
+                                  }
+                                ]
+                              },
+                              "Nm": {
+                                "allOf": [
+                                  {
+                                    "title": "Max140Text",
+                                    "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 140,
+                                    "example": 12345
+                                  },
+                                  {
+                                    "description": "Name\nName by which an agent is known and which is usually used to identify that agent\n"
+                                  }
+                                ]
+                              },
+                              "PstlAdr": {
+                                "allOf": [
+                                  {
+                                    "title": "PostalAddress24",
+                                    "type": "object",
+                                    "description": "Information that locates and identifies a specific address, as defined by postal services.\n",
+                                    "properties": {
+                                      "AdrTp": {
+                                        "title": "AddressType3Choice",
+                                        "type": "object",
+                                        "description": "Choice of formats for the type of address.\n",
+                                        "anyOf": [
+                                          {
+                                            "properties": {
+                                              "Cd": {
+                                                "allOf": [
+                                                  {
+                                                    "description": "AddressType2Code\nSpecifies the type of address.\nADDR Address\nPBOX PostBox\nHOME Home\nBIZZ Business\nMLTO MailingTo\nDLVY Delivery\n",
+                                                    "enum": [
+                                                      "ADDR",
+                                                      "PBOX",
+                                                      "HOME",
+                                                      "BIZZ",
+                                                      "MLTO",
+                                                      "DLVY"
+                                                    ],
+                                                    "type": "string",
+                                                    "example": "ADDR"
+                                                  },
+                                                  {
+                                                    "description": "Code\nType of address expressed as a code.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Cd"
+                                            ]
+                                          },
+                                          {
+                                            "properties": {
+                                              "Prtry": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "GenericIdentification30",
+                                                    "type": "object",
+                                                    "description": "Generic scheme identification for a party.\n",
+                                                    "properties": {
+                                                      "Id": {
+                                                        "allOf": [
+                                                          {
+                                                            "title": "Exact4AlphaNumericText",
+                                                            "description": "Specifies an alphanumeric string with a length of 4 characters.\n",
+                                                            "type": "string",
+                                                            "pattern": "^[a-zA-Z0-9]{4}$",
+                                                            "example": 1234
+                                                          },
+                                                          {
+                                                            "description": "Identification\nProprietary information, often a code, issued by the data source scheme issuer.\n"
+                                                          }
+                                                        ]
+                                                      },
+                                                      "Issr": {
+                                                        "allOf": [
+                                                          {
+                                                            "title": "Max35Text",
+                                                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                            "type": "string",
+                                                            "minLength": 1,
+                                                            "maxLength": 35,
+                                                            "example": 1.234567890123457e+34
+                                                          },
+                                                          {
+                                                            "description": "Issuer\nEntity that assigns the identification.\n"
+                                                          }
+                                                        ]
+                                                      },
+                                                      "SchmeNm": {
+                                                        "allOf": [
+                                                          {
+                                                            "title": "Max35Text",
+                                                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                            "type": "string",
+                                                            "minLength": 1,
+                                                            "maxLength": 35,
+                                                            "example": 1.234567890123457e+34
+                                                          },
+                                                          {
+                                                            "description": "SchemeName\nShort textual description of the scheme.\n"
+                                                          }
+                                                        ]
+                                                      }
+                                                    },
+                                                    "required": [
+                                                      "Id",
+                                                      "Issr"
+                                                    ],
+                                                    "example": {
+                                                      "Id": 1234,
+                                                      "Issr": "BIC",
+                                                      "SchmeNm": "BICFI"
+                                                    }
+                                                  },
+                                                  {
+                                                    "description": "Proprietary\nType of address expressed as a proprietary code.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Prtry"
+                                            ]
+                                          }
+                                        ],
+                                        "example": {
+                                          "Cd": "ADDR"
+                                        }
+                                      },
+                                      "Dept": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      },
+                                      "SubDept": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      },
+                                      "StrtNm": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      },
+                                      "BldgNb": {
+                                        "title": "Max16Text",
+                                        "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 16,
+                                        "example": 1234567890123456
+                                      },
+                                      "BldgNm": {
+                                        "title": "Max35Text",
+                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 35,
+                                        "example": 1.234567890123457e+34
+                                      },
+                                      "Flr": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      },
+                                      "PstBx": {
+                                        "title": "Max16Text",
+                                        "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 16,
+                                        "example": 1234567890123456
+                                      },
+                                      "Room": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      },
+                                      "PstCd": {
+                                        "title": "Max16Text",
+                                        "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 16,
+                                        "example": 1234567890123456
+                                      },
+                                      "TwnNm": {
+                                        "title": "Max35Text",
+                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 35,
+                                        "example": 1.234567890123457e+34
+                                      },
+                                      "TwnLctnNm": {
+                                        "title": "Max35Text",
+                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 35,
+                                        "example": 1.234567890123457e+34
+                                      },
+                                      "DstrctNm": {
+                                        "title": "Max35Text",
+                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 35,
+                                        "example": 1.234567890123457e+34
+                                      },
+                                      "CtrySubDvsn": {
+                                        "title": "Max35Text",
+                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 35,
+                                        "example": 1.234567890123457e+34
+                                      },
+                                      "Ctry": {
+                                        "title": "CountryCode",
+                                        "type": "string",
+                                        "pattern": "^[A-Z]{2,2}$",
+                                        "example": "US",
+                                        "description": "Code to identify a country, a dependency, or another area of particular geopolitical interest, on the basis of country names obtained from the United Nations (ISO 3166, Alpha-2 code).\n"
+                                      },
+                                      "AdrLine": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      }
+                                    },
+                                    "example": {
+                                      "AdrTp": "ADDR",
+                                      "Dept": "Dept",
+                                      "SubDept": "SubDept",
+                                      "StrtNm": "StrtNm",
+                                      "BldgNb": "BldgNb",
+                                      "BldgNm": "BldgNm",
+                                      "Flr": "Flr",
+                                      "PstBx": "PstBx",
+                                      "Room": "Room",
+                                      "PstCd": "PstCd",
+                                      "TwnNm": "TwnNm",
+                                      "TwnLctnNm": "TwnLctnNm",
+                                      "DstrctNm": "DstrctNm",
+                                      "CtrySubDvsn": "CtrySubDvsn",
+                                      "Ctry": "Ctry",
+                                      "AdrLine": "AdrLine"
+                                    }
+                                  },
+                                  {
+                                    "description": "PostalAddress\nInformation that locates and identifies a specific address, as defined by postal services.\n"
+                                  }
+                                ]
+                              },
+                              "Othr": {
+                                "allOf": [
+                                  {
+                                    "title": "GenericFinancialIdentification1",
+                                    "type": "object",
+                                    "description": "GenericFinancialIdentification\nUnique and unambiguous identification of a person, which is used to refer to a person in a financial context.\n",
+                                    "properties": {
+                                      "Id": {
+                                        "allOf": [
+                                          {
+                                            "title": "Max35Text",
+                                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                            "type": "string",
+                                            "minLength": 1,
+                                            "maxLength": 35,
+                                            "example": 1.234567890123457e+34
+                                          },
+                                          {
+                                            "description": "Identification\nUnique and unambiguous identification of a person.\n"
+                                          }
+                                        ]
+                                      },
+                                      "SchmeNm": {
+                                        "allOf": [
+                                          {
+                                            "title": "FinancialIdentificationSchemeName1Choice",
+                                            "type": "object",
+                                            "description": "Specifies the name of the identification scheme.\n",
+                                            "anyOf": [
+                                              {
+                                                "properties": {
+                                                  "Cd": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "ExternalFinancialInstitutionIdentification1Code",
+                                                        "description": "Specifies the external financial institution identification code.",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 4,
+                                                        "example": 1234
+                                                      },
+                                                      {
+                                                        "description": "Code\nName of the identification scheme, in a coded form as published in an external list.\n"
+                                                      }
+                                                    ]
+                                                  }
+                                                },
+                                                "required": [
+                                                  "Cd"
+                                                ]
+                                              },
+                                              {
+                                                "properties": {
+                                                  "Prtry": {
+                                                    "allOf": [
+                                                      {
+                                                        "title": "Max35Text",
+                                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                        "type": "string",
+                                                        "minLength": 1,
+                                                        "maxLength": 35,
+                                                        "example": 1.234567890123457e+34
+                                                      },
+                                                      {
+                                                        "description": "Proprietary\nName of the identification scheme, in a free text form.\n"
+                                                      }
+                                                    ]
+                                                  }
+                                                },
+                                                "required": [
+                                                  "Prtry"
+                                                ]
+                                              }
+                                            ],
+                                            "example": {
+                                              "Cd": "BIC"
+                                            }
+                                          },
+                                          {
+                                            "description": "SchemeName\nName of the identification scheme.\n"
+                                          }
+                                        ]
+                                      },
+                                      "Issr": {
+                                        "allOf": [
+                                          {
+                                            "title": "Max35Text",
+                                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                            "type": "string",
+                                            "minLength": 1,
+                                            "maxLength": 35,
+                                            "example": 1.234567890123457e+34
+                                          },
+                                          {
+                                            "description": "Issuer\nEntity that assigns the identification.\n"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "required": [
+                                      "Id"
+                                    ],
+                                    "example": {
+                                      "Id": 123,
+                                      "SchmeNm": {
+                                        "Cd": "IBAN"
+                                      },
+                                      "Issr": "BIC"
+                                    }
+                                  },
+                                  {
+                                    "description": "Other\nUnique identification of an agent, as assigned by an institution, using an identification scheme.\n"
+                                  }
+                                ]
+                              }
+                            },
+                            "required": [],
+                            "example": {
+                              "BICFI": "J5BMVH7D",
+                              "ClrSysMmbId": {
+                                "ClrSysId": 1234,
+                                "MmbId": 123
+                              },
+                              "LEI": 123,
+                              "Nm": "Name",
+                              "PstlAdr": {
+                                "AdrTp": "ADDR",
+                                "Dept": "Department",
+                                "SubDept": "Sub department",
+                                "StrtNm": "Street name",
+                                "BldgNb": "Building number",
+                                "PstCd": "Post code",
+                                "TwnNm": "Town name",
+                                "CtrySubDvsn": "Country subdivision",
+                                "Ctry": "Country",
+                                "AdrLine": "Address line"
+                              },
+                              "Othr": {
+                                "Id": 123,
+                                "SchmeNm": {
+                                  "Cd": 123,
+                                  "Prtry": 123
+                                },
+                                "Issr": 123
+                              }
+                            }
+                          },
+                          {
+                            "description": "FinancialInstitutionIdentification\nUnique and unambiguous identification of a financial institution or a branch of a financial institution.\n"
+                          }
+                        ]
+                      },
+                      "BrnchId": {
+                        "allOf": [
+                          {
+                            "title": "BranchData5",
+                            "description": "Information that locates and identifies a specific branch of a financial institution.\n",
+                            "type": "object",
+                            "properties": {
+                              "Id": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "Identification\nUnique and unambiguous identification of a branch of a financial institution.\n"
+                                  }
+                                ]
+                              },
+                              "LEI": {
+                                "allOf": [
+                                  {
+                                    "title": "LEIIdentifier",
+                                    "description": "Legal Entity Identifier is a code allocated to a party as described in ISO 17442 \"Financial Services - Legal Entity Identifier (LEI)\". ^([0-9A-Z]{18,18}[0-9]{2,2})$\n",
+                                    "type": "string",
+                                    "pattern": "^[A-Z0-9]{18,18}[0-9]{2,2}$",
+                                    "example": "529900T8BM49AURSDO55"
+                                  },
+                                  {
+                                    "description": "LEI\nLegal entity identification for the branch of the financial institution.\n"
+                                  }
+                                ]
+                              },
+                              "Nm": {
+                                "allOf": [
+                                  {
+                                    "title": "Max140Text",
+                                    "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 140,
+                                    "example": 12345
+                                  },
+                                  {
+                                    "description": "Name\nName by which an agent is known and which is usually used to identify that agent.\n"
+                                  }
+                                ]
+                              },
+                              "PstlAdr": {
+                                "allOf": [
+                                  {
+                                    "title": "PostalAddress27",
+                                    "type": "object",
+                                    "description": "Information that locates and identifies a specific address, as defined by postal services.\n",
+                                    "properties": {
+                                      "AdrTp": {
+                                        "title": "AddressType3Choice",
+                                        "type": "object",
+                                        "description": "Choice of formats for the type of address.\n",
+                                        "anyOf": [
+                                          {
+                                            "properties": {
+                                              "Cd": {
+                                                "allOf": [
+                                                  {
+                                                    "description": "AddressType2Code\nSpecifies the type of address.\nADDR Address\nPBOX PostBox\nHOME Home\nBIZZ Business\nMLTO MailingTo\nDLVY Delivery\n",
+                                                    "enum": [
+                                                      "ADDR",
+                                                      "PBOX",
+                                                      "HOME",
+                                                      "BIZZ",
+                                                      "MLTO",
+                                                      "DLVY"
+                                                    ],
+                                                    "type": "string",
+                                                    "example": "ADDR"
+                                                  },
+                                                  {
+                                                    "description": "Code\nType of address expressed as a code.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Cd"
+                                            ]
+                                          },
+                                          {
+                                            "properties": {
+                                              "Prtry": {
+                                                "allOf": [
+                                                  {
+                                                    "title": "GenericIdentification30",
+                                                    "type": "object",
+                                                    "description": "Generic scheme identification for a party.\n",
+                                                    "properties": {
+                                                      "Id": {
+                                                        "allOf": [
+                                                          {
+                                                            "title": "Exact4AlphaNumericText",
+                                                            "description": "Specifies an alphanumeric string with a length of 4 characters.\n",
+                                                            "type": "string",
+                                                            "pattern": "^[a-zA-Z0-9]{4}$",
+                                                            "example": 1234
+                                                          },
+                                                          {
+                                                            "description": "Identification\nProprietary information, often a code, issued by the data source scheme issuer.\n"
+                                                          }
+                                                        ]
+                                                      },
+                                                      "Issr": {
+                                                        "allOf": [
+                                                          {
+                                                            "title": "Max35Text",
+                                                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                            "type": "string",
+                                                            "minLength": 1,
+                                                            "maxLength": 35,
+                                                            "example": 1.234567890123457e+34
+                                                          },
+                                                          {
+                                                            "description": "Issuer\nEntity that assigns the identification.\n"
+                                                          }
+                                                        ]
+                                                      },
+                                                      "SchmeNm": {
+                                                        "allOf": [
+                                                          {
+                                                            "title": "Max35Text",
+                                                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                                            "type": "string",
+                                                            "minLength": 1,
+                                                            "maxLength": 35,
+                                                            "example": 1.234567890123457e+34
+                                                          },
+                                                          {
+                                                            "description": "SchemeName\nShort textual description of the scheme.\n"
+                                                          }
+                                                        ]
+                                                      }
+                                                    },
+                                                    "required": [
+                                                      "Id",
+                                                      "Issr"
+                                                    ],
+                                                    "example": {
+                                                      "Id": 1234,
+                                                      "Issr": "BIC",
+                                                      "SchmeNm": "BICFI"
+                                                    }
+                                                  },
+                                                  {
+                                                    "description": "Proprietary\nType of address expressed as a proprietary code.\n"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "required": [
+                                              "Prtry"
+                                            ]
+                                          }
+                                        ],
+                                        "example": {
+                                          "Cd": "ADDR"
+                                        }
+                                      },
+                                      "CareOf": {
+                                        "title": "Max140Text",
+                                        "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 140,
+                                        "example": 12345
+                                      },
+                                      "Dept": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      },
+                                      "SubDept": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      },
+                                      "StrtNm": {
+                                        "title": "Max140Text",
+                                        "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 140,
+                                        "example": 12345
+                                      },
+                                      "BldgNb": {
+                                        "title": "Max16Text",
+                                        "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 16,
+                                        "example": 1234567890123456
+                                      },
+                                      "BldgNm": {
+                                        "title": "Max140Text",
+                                        "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 140,
+                                        "example": 12345
+                                      },
+                                      "Flr": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      },
+                                      "UnitNb": {
+                                        "title": "Max16Text",
+                                        "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 16,
+                                        "example": 1234567890123456
+                                      },
+                                      "PstBx": {
+                                        "title": "Max16Text",
+                                        "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 16,
+                                        "example": 1234567890123456
+                                      },
+                                      "Room": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      },
+                                      "PstCd": {
+                                        "title": "Max16Text",
+                                        "description": "Specifies a character string with a maximum length of 16 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 16,
+                                        "example": 1234567890123456
+                                      },
+                                      "TwnNm": {
+                                        "title": "Max140Text",
+                                        "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 140,
+                                        "example": 12345
+                                      },
+                                      "TwnLctnNm": {
+                                        "title": "Max140Text",
+                                        "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 140,
+                                        "example": 12345
+                                      },
+                                      "DstrctNm": {
+                                        "title": "Max140Text",
+                                        "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 140,
+                                        "example": 12345
+                                      },
+                                      "CtrySubDvsn": {
+                                        "title": "Max35Text",
+                                        "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 35,
+                                        "example": 1.234567890123457e+34
+                                      },
+                                      "Ctry": {
+                                        "title": "CountryCode",
+                                        "type": "string",
+                                        "pattern": "^[A-Z]{2,2}$",
+                                        "example": "US",
+                                        "description": "Code to identify a country, a dependency, or another area of particular geopolitical interest, on the basis of country names obtained from the United Nations (ISO 3166, Alpha-2 code).\n"
+                                      },
+                                      "AdrLine": {
+                                        "title": "Max70Text",
+                                        "description": "Specifies a character string with a maximum length of 70 characters.\n",
+                                        "type": "string",
+                                        "minLength": 1,
+                                        "maxLength": 70,
+                                        "example": 1.2345678901234567e+99
+                                      }
+                                    },
+                                    "example": {
+                                      "AdrTp": "ADDR",
+                                      "CareOf": "CareOf",
+                                      "Dept": "Dept",
+                                      "SubDept": "SubDept",
+                                      "StrtNm": "StrtNm",
+                                      "BldgNb": "BldgNb",
+                                      "BldgNm": "BldgNm",
+                                      "Flr": "Flr",
+                                      "UnitNb": "UnitNb",
+                                      "PstBx": "PstBx",
+                                      "Room": "Room",
+                                      "PstCd": "PstCd",
+                                      "TwnNm": "TwnNm",
+                                      "TwnLctnNm": "TwnLctnNm",
+                                      "DstrctNm": "DstrctNm",
+                                      "CtrySubDvsn": "CtrySubDvsn",
+                                      "Ctry": "Ctry",
+                                      "AdrLine": "AdrLine"
+                                    }
+                                  },
+                                  {
+                                    "description": "PostalAddress\nInformation that locates and identifies a specific address, as defined by postal services.\n"
+                                  }
+                                ]
+                              }
+                            },
+                            "example": {
+                              "Id": 123,
+                              "LEI": 123,
+                              "Nm": "Name",
+                              "PstlAdr": {
+                                "AdrTp": "ADDR",
+                                "Dept": "Department",
+                                "SubDept": "Sub department",
+                                "StrtNm": "Street name",
+                                "BldgNb": "Building number"
+                              }
+                            }
+                          },
+                          {
+                            "description": "BranchIdentification\nIdentifies a specific branch of a financial institution.\n"
+                          }
+                        ]
+                      }
+                    },
+                    "required": [
+                      "FinInstnId"
+                    ],
+                    "example": {
+                      "FinInstnId": {
+                        "BICFI": "J5BMVH7D"
+                      },
+                      "BrnchId": {
+                        "Id": 123,
+                        "Nm": "Name",
+                        "PstlAdr": {
+                          "AdrTp": "ADDR",
+                          "Dept": "Department",
+                          "SubDept": "Sub department",
+                          "StrtNm": "Street name",
+                          "BldgNb": "Building number",
+                          "PstCd": "Post code",
+                          "TwnNm": "Town name",
+                          "CtrySubDvsn": "Country subdivision",
+                          "Ctry": "Country",
+                          "AdrLine": "Address line"
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "description": "Financial institution servicing an account for the creditor.\n"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "Dbtr",
+              "Cdtr",
+              "DbtrAgt",
+              "CdtrAgt"
+            ]
+          },
+          {
+            "description": "Underlying Customer Credit Transfer\nTBD\n"
+          }
+        ]
+      },
+      "IntrBkSttlmAmt": {
+        "allOf": [
+          {
+            "title": "ActiveCurrencyAndAmount",
+            "type": "object",
+            "description": "A number of monetary units specified in an active currency where the unit of currency is explicit and compliant with ISO 4217.\n",
+            "properties": {
+              "ActiveCurrencyAndAmount": {
+                "allOf": [
+                  {
+                    "title": "ActiveCurrencyAndAmount_SimpleType",
+                    "type": "string",
+                    "pattern": "^(?!0\\d)(\\d{1,18}|\\d{1,17}.\\d{1}|\\d{1,16}.\\d{1,2}|\\d{1,15}.\\d{1,3}|\\d{1,14}.\\d{1,4}|\\d{1,13}.\\d{1,5})$",
+                    "example": 123.45
+                  }
+                ]
+              },
+              "Ccy": {
+                "allOf": [
+                  {
+                    "title": "ActiveCurrencyCode",
+                    "type": "string",
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
                   },
                   {
                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -24216,9 +38445,176 @@
                   {
                     "title": "ActiveOrHistoricCurrencyCode",
                     "type": "string",
-                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                    "pattern": "^[A-Z]{3,3}$",
-                    "example": "USD"
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
                   },
                   {
                     "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -27445,9 +41841,176 @@
                   {
                     "title": "ActiveOrHistoricCurrencyCode",
                     "type": "string",
-                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                    "pattern": "^[A-Z]{3,3}$",
-                    "example": "USD"
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
                   },
                   {
                     "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -27591,7 +42154,7 @@
       "InstrForCdtrAgt": {
         "allOf": [
           {
-            "title": "InstructionForCreditorAgent3",
+            "title": "InstructionForCreditorAgent3_Put_FX_Quotes_ID",
             "description": "Further information related to the processing of the payment instruction, provided by the initiating party, and intended for the creditor agent.\n",
             "type": "object",
             "properties": {
@@ -27613,12 +42176,14 @@
               "InstrInf": {
                 "allOf": [
                   {
-                    "title": "Max140Text",
-                    "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                    "title": "AmountTypeEnum",
+                    "description": "NOTE: This pattern is not the original ISO20022 specification.\n      This represents the enum values when mapping to and from FSPIOP specification.\n",
                     "type": "string",
-                    "minLength": 1,
-                    "maxLength": 140,
-                    "example": 12345
+                    "enum": [
+                      "SEND",
+                      "RECEIVE"
+                    ],
+                    "example": "SEND"
                   },
                   {
                     "description": "InstructionInformation\nFurther information complementing the coded instruction or instruction to the creditor's agent that is bilaterally agreed or specific to a user community.\n"
@@ -27730,9 +42295,10 @@
                     "allOf": [
                       {
                         "title": "Exact32HexBinaryText",
-                        "description": "Specifies a hexadecimal string with a length of 32 characters.\n",
+                        "description": "Specifies a hexadecimal string.\n\nNOTE: This pattern is not the original ISO20022 specification.\n",
                         "type": "string",
-                        "example": "1234567890ABCDEF1234567890ABCDEF"
+                        "pattern": "^[A-Za-z0-9-_]{43}$",
+                        "maxLength": 48
                       },
                       {
                         "description": "SHA-256 signature of the terms\n"
@@ -27845,9 +42411,10 @@
             "allOf": [
               {
                 "title": "Exact32HexBinaryText",
-                "description": "Specifies a hexadecimal string with a length of 32 characters.\n",
+                "description": "Specifies a hexadecimal string.\n\nNOTE: This pattern is not the original ISO20022 specification.\n",
                 "type": "string",
-                "example": "1234567890ABCDEF1234567890ABCDEF"
+                "pattern": "^[A-Za-z0-9-_]{43}$",
+                "maxLength": 48
               },
               {
                 "description": "SHA-256 signature of the terms\n"
@@ -28190,9 +42757,10 @@
   },
   "Exact32HexBinaryText": {
     "title": "Exact32HexBinaryText",
-    "description": "Specifies a hexadecimal string with a length of 32 characters.\n",
+    "description": "Specifies a hexadecimal string.\n\nNOTE: This pattern is not the original ISO20022 specification.\n",
     "type": "string",
-    "example": "1234567890ABCDEF1234567890ABCDEF"
+    "pattern": "^[A-Za-z0-9-_]{43}$",
+    "maxLength": 48
   },
   "Exact4AlphaNumericText": {
     "title": "Exact4AlphaNumericText",
@@ -28613,45 +43181,39 @@
                       "InstrId": {
                         "allOf": [
                           {
-                            "title": "Max35Text",
-                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "title": "ULIDIdentifier",
                             "type": "string",
-                            "minLength": 1,
-                            "maxLength": 35,
-                            "example": 1.234567890123457e+34
+                            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                            "example": "01AN4Z07BY79KA1307SR9X4MV3"
                           },
                           {
-                            "description": "InstructionIdentification (FSPIOP equivalent: transactionRequestId)\n\nDefinition: Unique identification, as assigned by an instructing party for an instructed party, to\nunambiguously identify the instruction.\n\nUsage: The instruction identification is a point to point reference that can be used between the\ninstructing party and the instructed party to refer to the individual instruction. It can be included in\nseveral messages related to the instruction.\n"
+                            "description": "InstructionIdentification (FSPIOP equivalent: transactionRequestId)\n\nDefinition: Unique identification, as assigned by an instructing party for an instructed party, to\nunambiguously identify the instruction.\n\nUsage: The instruction identification is a point to point reference that can be used between the\ninstructing party and the instructed party to refer to the individual instruction. It can be included in\nseveral messages related to the instruction.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                           }
                         ]
                       },
                       "EndToEndId": {
                         "allOf": [
                           {
-                            "title": "Max35Text",
-                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "title": "ULIDIdentifier",
                             "type": "string",
-                            "minLength": 1,
-                            "maxLength": 35,
-                            "example": 1.234567890123457e+34
+                            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                            "example": "01AN4Z07BY79KA1307SR9X4MV3"
                           },
                           {
-                            "description": "EndToEndIdentification (FSPIOP equivalent: transactionId)\n\nDefinition: Unique identification, as assigned by the initiating party, to unambiguously identify the\ntransaction. This identification is passed on, unchanged, throughout the entire end-to-end chain.\n\nUsage: The end-to-end identification can be used for reconciliation or to link tasks relating to the\ntransaction. It can be included in several messages related to the transaction.\n\nUsage: In case there are technical limitations to pass on multiple references, the end-to-end\nidentification must be passed on throughout the entire end-to-end chain.\n"
+                            "description": "EndToEndIdentification (FSPIOP equivalent: transactionId)\n\nDefinition: Unique identification, as assigned by the initiating party, to unambiguously identify the\ntransaction. This identification is passed on, unchanged, throughout the entire end-to-end chain.\n\nUsage: The end-to-end identification can be used for reconciliation or to link tasks relating to the\ntransaction. It can be included in several messages related to the transaction.\n\nUsage: In case there are technical limitations to pass on multiple references, the end-to-end\nidentification must be passed on throughout the entire end-to-end chain.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                           }
                         ]
                       },
                       "TxId": {
                         "allOf": [
                           {
-                            "title": "Max35Text",
-                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "title": "ULIDIdentifier",
                             "type": "string",
-                            "minLength": 1,
-                            "maxLength": 35,
-                            "example": 1.234567890123457e+34
+                            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                            "example": "01AN4Z07BY79KA1307SR9X4MV3"
                           },
                           {
-                            "description": "TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)\n\nDefinition: Unique identification, as assigned by the first instructing agent, to unambiguously identify the\ntransaction that is passed on, unchanged, throughout the entire interbank chain.\n\nUsage: The transaction identification can be used for reconciliation, tracking or to link tasks relating to\nthe transaction on the interbank level.\n\nUsage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.\n"
+                            "description": "TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)\n\nDefinition: Unique identification, as assigned by the first instructing agent, to unambiguously identify the\ntransaction that is passed on, unchanged, throughout the entire interbank chain.\n\nUsage: The transaction identification can be used for reconciliation, tracking or to link tasks relating to\nthe transaction on the interbank level.\n\nUsage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                           }
                         ]
                       },
@@ -28962,9 +43524,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -33017,9 +47746,176 @@
                           {
                             "title": "ActiveCurrencyCode",
                             "type": "string",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -33066,9 +47962,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -33147,9 +48210,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -35527,9 +50757,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -38852,9 +54249,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -39317,9 +54881,176 @@
                                           {
                                             "title": "ActiveOrHistoricCurrencyCode",
                                             "type": "string",
-                                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                            "pattern": "^[A-Z]{3,3}$",
-                                            "example": "USD"
+                                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                            "example": "USD",
+                                            "minLength": 3,
+                                            "maxLength": 3,
+                                            "enum": [
+                                              "AED",
+                                              "AFN",
+                                              "ALL",
+                                              "AMD",
+                                              "ANG",
+                                              "AOA",
+                                              "ARS",
+                                              "AUD",
+                                              "AWG",
+                                              "AZN",
+                                              "BAM",
+                                              "BBD",
+                                              "BDT",
+                                              "BGN",
+                                              "BHD",
+                                              "BIF",
+                                              "BMD",
+                                              "BND",
+                                              "BOB",
+                                              "BRL",
+                                              "BSD",
+                                              "BTN",
+                                              "BWP",
+                                              "BYN",
+                                              "BZD",
+                                              "CAD",
+                                              "CDF",
+                                              "CHF",
+                                              "CLP",
+                                              "CNY",
+                                              "COP",
+                                              "CRC",
+                                              "CUC",
+                                              "CUP",
+                                              "CVE",
+                                              "CZK",
+                                              "DJF",
+                                              "DKK",
+                                              "DOP",
+                                              "DZD",
+                                              "EGP",
+                                              "ERN",
+                                              "ETB",
+                                              "EUR",
+                                              "FJD",
+                                              "FKP",
+                                              "GBP",
+                                              "GEL",
+                                              "GGP",
+                                              "GHS",
+                                              "GIP",
+                                              "GMD",
+                                              "GNF",
+                                              "GTQ",
+                                              "GYD",
+                                              "HKD",
+                                              "HNL",
+                                              "HRK",
+                                              "HTG",
+                                              "HUF",
+                                              "IDR",
+                                              "ILS",
+                                              "IMP",
+                                              "INR",
+                                              "IQD",
+                                              "IRR",
+                                              "ISK",
+                                              "JEP",
+                                              "JMD",
+                                              "JOD",
+                                              "JPY",
+                                              "KES",
+                                              "KGS",
+                                              "KHR",
+                                              "KMF",
+                                              "KPW",
+                                              "KRW",
+                                              "KWD",
+                                              "KYD",
+                                              "KZT",
+                                              "LAK",
+                                              "LBP",
+                                              "LKR",
+                                              "LRD",
+                                              "LSL",
+                                              "LYD",
+                                              "MAD",
+                                              "MDL",
+                                              "MGA",
+                                              "MKD",
+                                              "MMK",
+                                              "MNT",
+                                              "MOP",
+                                              "MRO",
+                                              "MUR",
+                                              "MVR",
+                                              "MWK",
+                                              "MXN",
+                                              "MYR",
+                                              "MZN",
+                                              "NAD",
+                                              "NGN",
+                                              "NIO",
+                                              "NOK",
+                                              "NPR",
+                                              "NZD",
+                                              "OMR",
+                                              "PAB",
+                                              "PEN",
+                                              "PGK",
+                                              "PHP",
+                                              "PKR",
+                                              "PLN",
+                                              "PYG",
+                                              "QAR",
+                                              "RON",
+                                              "RSD",
+                                              "RUB",
+                                              "RWF",
+                                              "SAR",
+                                              "SBD",
+                                              "SCR",
+                                              "SDG",
+                                              "SEK",
+                                              "SGD",
+                                              "SHP",
+                                              "SLL",
+                                              "SOS",
+                                              "SPL",
+                                              "SRD",
+                                              "STD",
+                                              "SVC",
+                                              "SYP",
+                                              "SZL",
+                                              "THB",
+                                              "TJS",
+                                              "TMT",
+                                              "TND",
+                                              "TOP",
+                                              "TRY",
+                                              "TTD",
+                                              "TVD",
+                                              "TWD",
+                                              "TZS",
+                                              "UAH",
+                                              "UGX",
+                                              "USD",
+                                              "UYU",
+                                              "UZS",
+                                              "VEF",
+                                              "VND",
+                                              "VUV",
+                                              "WST",
+                                              "XAF",
+                                              "XCD",
+                                              "XDR",
+                                              "XOF",
+                                              "XPF",
+                                              "XTS",
+                                              "XXX",
+                                              "YER",
+                                              "ZAR",
+                                              "ZMW",
+                                              "ZWD"
+                                            ]
                                           },
                                           {
                                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -39467,9 +55198,176 @@
                                             {
                                               "title": "ActiveOrHistoricCurrencyCode",
                                               "type": "string",
-                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                              "pattern": "^[A-Z]{3,3}$",
-                                              "example": "USD"
+                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                              "example": "USD",
+                                              "minLength": 3,
+                                              "maxLength": 3,
+                                              "enum": [
+                                                "AED",
+                                                "AFN",
+                                                "ALL",
+                                                "AMD",
+                                                "ANG",
+                                                "AOA",
+                                                "ARS",
+                                                "AUD",
+                                                "AWG",
+                                                "AZN",
+                                                "BAM",
+                                                "BBD",
+                                                "BDT",
+                                                "BGN",
+                                                "BHD",
+                                                "BIF",
+                                                "BMD",
+                                                "BND",
+                                                "BOB",
+                                                "BRL",
+                                                "BSD",
+                                                "BTN",
+                                                "BWP",
+                                                "BYN",
+                                                "BZD",
+                                                "CAD",
+                                                "CDF",
+                                                "CHF",
+                                                "CLP",
+                                                "CNY",
+                                                "COP",
+                                                "CRC",
+                                                "CUC",
+                                                "CUP",
+                                                "CVE",
+                                                "CZK",
+                                                "DJF",
+                                                "DKK",
+                                                "DOP",
+                                                "DZD",
+                                                "EGP",
+                                                "ERN",
+                                                "ETB",
+                                                "EUR",
+                                                "FJD",
+                                                "FKP",
+                                                "GBP",
+                                                "GEL",
+                                                "GGP",
+                                                "GHS",
+                                                "GIP",
+                                                "GMD",
+                                                "GNF",
+                                                "GTQ",
+                                                "GYD",
+                                                "HKD",
+                                                "HNL",
+                                                "HRK",
+                                                "HTG",
+                                                "HUF",
+                                                "IDR",
+                                                "ILS",
+                                                "IMP",
+                                                "INR",
+                                                "IQD",
+                                                "IRR",
+                                                "ISK",
+                                                "JEP",
+                                                "JMD",
+                                                "JOD",
+                                                "JPY",
+                                                "KES",
+                                                "KGS",
+                                                "KHR",
+                                                "KMF",
+                                                "KPW",
+                                                "KRW",
+                                                "KWD",
+                                                "KYD",
+                                                "KZT",
+                                                "LAK",
+                                                "LBP",
+                                                "LKR",
+                                                "LRD",
+                                                "LSL",
+                                                "LYD",
+                                                "MAD",
+                                                "MDL",
+                                                "MGA",
+                                                "MKD",
+                                                "MMK",
+                                                "MNT",
+                                                "MOP",
+                                                "MRO",
+                                                "MUR",
+                                                "MVR",
+                                                "MWK",
+                                                "MXN",
+                                                "MYR",
+                                                "MZN",
+                                                "NAD",
+                                                "NGN",
+                                                "NIO",
+                                                "NOK",
+                                                "NPR",
+                                                "NZD",
+                                                "OMR",
+                                                "PAB",
+                                                "PEN",
+                                                "PGK",
+                                                "PHP",
+                                                "PKR",
+                                                "PLN",
+                                                "PYG",
+                                                "QAR",
+                                                "RON",
+                                                "RSD",
+                                                "RUB",
+                                                "RWF",
+                                                "SAR",
+                                                "SBD",
+                                                "SCR",
+                                                "SDG",
+                                                "SEK",
+                                                "SGD",
+                                                "SHP",
+                                                "SLL",
+                                                "SOS",
+                                                "SPL",
+                                                "SRD",
+                                                "STD",
+                                                "SVC",
+                                                "SYP",
+                                                "SZL",
+                                                "THB",
+                                                "TJS",
+                                                "TMT",
+                                                "TND",
+                                                "TOP",
+                                                "TRY",
+                                                "TTD",
+                                                "TVD",
+                                                "TWD",
+                                                "TZS",
+                                                "UAH",
+                                                "UGX",
+                                                "USD",
+                                                "UYU",
+                                                "UZS",
+                                                "VEF",
+                                                "VND",
+                                                "VUV",
+                                                "WST",
+                                                "XAF",
+                                                "XCD",
+                                                "XDR",
+                                                "XOF",
+                                                "XPF",
+                                                "XTS",
+                                                "XXX",
+                                                "YER",
+                                                "ZAR",
+                                                "ZMW",
+                                                "ZWD"
+                                              ]
                                             },
                                             {
                                               "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -39923,9 +55821,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -39972,9 +56037,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -40285,9 +56517,176 @@
                                                   {
                                                     "title": "ActiveOrHistoricCurrencyCode",
                                                     "type": "string",
-                                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                    "pattern": "^[A-Z]{3,3}$",
-                                                    "example": "USD"
+                                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                    "example": "USD",
+                                                    "minLength": 3,
+                                                    "maxLength": 3,
+                                                    "enum": [
+                                                      "AED",
+                                                      "AFN",
+                                                      "ALL",
+                                                      "AMD",
+                                                      "ANG",
+                                                      "AOA",
+                                                      "ARS",
+                                                      "AUD",
+                                                      "AWG",
+                                                      "AZN",
+                                                      "BAM",
+                                                      "BBD",
+                                                      "BDT",
+                                                      "BGN",
+                                                      "BHD",
+                                                      "BIF",
+                                                      "BMD",
+                                                      "BND",
+                                                      "BOB",
+                                                      "BRL",
+                                                      "BSD",
+                                                      "BTN",
+                                                      "BWP",
+                                                      "BYN",
+                                                      "BZD",
+                                                      "CAD",
+                                                      "CDF",
+                                                      "CHF",
+                                                      "CLP",
+                                                      "CNY",
+                                                      "COP",
+                                                      "CRC",
+                                                      "CUC",
+                                                      "CUP",
+                                                      "CVE",
+                                                      "CZK",
+                                                      "DJF",
+                                                      "DKK",
+                                                      "DOP",
+                                                      "DZD",
+                                                      "EGP",
+                                                      "ERN",
+                                                      "ETB",
+                                                      "EUR",
+                                                      "FJD",
+                                                      "FKP",
+                                                      "GBP",
+                                                      "GEL",
+                                                      "GGP",
+                                                      "GHS",
+                                                      "GIP",
+                                                      "GMD",
+                                                      "GNF",
+                                                      "GTQ",
+                                                      "GYD",
+                                                      "HKD",
+                                                      "HNL",
+                                                      "HRK",
+                                                      "HTG",
+                                                      "HUF",
+                                                      "IDR",
+                                                      "ILS",
+                                                      "IMP",
+                                                      "INR",
+                                                      "IQD",
+                                                      "IRR",
+                                                      "ISK",
+                                                      "JEP",
+                                                      "JMD",
+                                                      "JOD",
+                                                      "JPY",
+                                                      "KES",
+                                                      "KGS",
+                                                      "KHR",
+                                                      "KMF",
+                                                      "KPW",
+                                                      "KRW",
+                                                      "KWD",
+                                                      "KYD",
+                                                      "KZT",
+                                                      "LAK",
+                                                      "LBP",
+                                                      "LKR",
+                                                      "LRD",
+                                                      "LSL",
+                                                      "LYD",
+                                                      "MAD",
+                                                      "MDL",
+                                                      "MGA",
+                                                      "MKD",
+                                                      "MMK",
+                                                      "MNT",
+                                                      "MOP",
+                                                      "MRO",
+                                                      "MUR",
+                                                      "MVR",
+                                                      "MWK",
+                                                      "MXN",
+                                                      "MYR",
+                                                      "MZN",
+                                                      "NAD",
+                                                      "NGN",
+                                                      "NIO",
+                                                      "NOK",
+                                                      "NPR",
+                                                      "NZD",
+                                                      "OMR",
+                                                      "PAB",
+                                                      "PEN",
+                                                      "PGK",
+                                                      "PHP",
+                                                      "PKR",
+                                                      "PLN",
+                                                      "PYG",
+                                                      "QAR",
+                                                      "RON",
+                                                      "RSD",
+                                                      "RUB",
+                                                      "RWF",
+                                                      "SAR",
+                                                      "SBD",
+                                                      "SCR",
+                                                      "SDG",
+                                                      "SEK",
+                                                      "SGD",
+                                                      "SHP",
+                                                      "SLL",
+                                                      "SOS",
+                                                      "SPL",
+                                                      "SRD",
+                                                      "STD",
+                                                      "SVC",
+                                                      "SYP",
+                                                      "SZL",
+                                                      "THB",
+                                                      "TJS",
+                                                      "TMT",
+                                                      "TND",
+                                                      "TOP",
+                                                      "TRY",
+                                                      "TTD",
+                                                      "TVD",
+                                                      "TWD",
+                                                      "TZS",
+                                                      "UAH",
+                                                      "UGX",
+                                                      "USD",
+                                                      "UYU",
+                                                      "UZS",
+                                                      "VEF",
+                                                      "VND",
+                                                      "VUV",
+                                                      "WST",
+                                                      "XAF",
+                                                      "XCD",
+                                                      "XDR",
+                                                      "XOF",
+                                                      "XPF",
+                                                      "XTS",
+                                                      "XXX",
+                                                      "YER",
+                                                      "ZAR",
+                                                      "ZMW",
+                                                      "ZWD"
+                                                    ]
                                                   },
                                                   {
                                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -40334,9 +56733,176 @@
                                                   {
                                                     "title": "ActiveOrHistoricCurrencyCode",
                                                     "type": "string",
-                                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                    "pattern": "^[A-Z]{3,3}$",
-                                                    "example": "USD"
+                                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                    "example": "USD",
+                                                    "minLength": 3,
+                                                    "maxLength": 3,
+                                                    "enum": [
+                                                      "AED",
+                                                      "AFN",
+                                                      "ALL",
+                                                      "AMD",
+                                                      "ANG",
+                                                      "AOA",
+                                                      "ARS",
+                                                      "AUD",
+                                                      "AWG",
+                                                      "AZN",
+                                                      "BAM",
+                                                      "BBD",
+                                                      "BDT",
+                                                      "BGN",
+                                                      "BHD",
+                                                      "BIF",
+                                                      "BMD",
+                                                      "BND",
+                                                      "BOB",
+                                                      "BRL",
+                                                      "BSD",
+                                                      "BTN",
+                                                      "BWP",
+                                                      "BYN",
+                                                      "BZD",
+                                                      "CAD",
+                                                      "CDF",
+                                                      "CHF",
+                                                      "CLP",
+                                                      "CNY",
+                                                      "COP",
+                                                      "CRC",
+                                                      "CUC",
+                                                      "CUP",
+                                                      "CVE",
+                                                      "CZK",
+                                                      "DJF",
+                                                      "DKK",
+                                                      "DOP",
+                                                      "DZD",
+                                                      "EGP",
+                                                      "ERN",
+                                                      "ETB",
+                                                      "EUR",
+                                                      "FJD",
+                                                      "FKP",
+                                                      "GBP",
+                                                      "GEL",
+                                                      "GGP",
+                                                      "GHS",
+                                                      "GIP",
+                                                      "GMD",
+                                                      "GNF",
+                                                      "GTQ",
+                                                      "GYD",
+                                                      "HKD",
+                                                      "HNL",
+                                                      "HRK",
+                                                      "HTG",
+                                                      "HUF",
+                                                      "IDR",
+                                                      "ILS",
+                                                      "IMP",
+                                                      "INR",
+                                                      "IQD",
+                                                      "IRR",
+                                                      "ISK",
+                                                      "JEP",
+                                                      "JMD",
+                                                      "JOD",
+                                                      "JPY",
+                                                      "KES",
+                                                      "KGS",
+                                                      "KHR",
+                                                      "KMF",
+                                                      "KPW",
+                                                      "KRW",
+                                                      "KWD",
+                                                      "KYD",
+                                                      "KZT",
+                                                      "LAK",
+                                                      "LBP",
+                                                      "LKR",
+                                                      "LRD",
+                                                      "LSL",
+                                                      "LYD",
+                                                      "MAD",
+                                                      "MDL",
+                                                      "MGA",
+                                                      "MKD",
+                                                      "MMK",
+                                                      "MNT",
+                                                      "MOP",
+                                                      "MRO",
+                                                      "MUR",
+                                                      "MVR",
+                                                      "MWK",
+                                                      "MXN",
+                                                      "MYR",
+                                                      "MZN",
+                                                      "NAD",
+                                                      "NGN",
+                                                      "NIO",
+                                                      "NOK",
+                                                      "NPR",
+                                                      "NZD",
+                                                      "OMR",
+                                                      "PAB",
+                                                      "PEN",
+                                                      "PGK",
+                                                      "PHP",
+                                                      "PKR",
+                                                      "PLN",
+                                                      "PYG",
+                                                      "QAR",
+                                                      "RON",
+                                                      "RSD",
+                                                      "RUB",
+                                                      "RWF",
+                                                      "SAR",
+                                                      "SBD",
+                                                      "SCR",
+                                                      "SDG",
+                                                      "SEK",
+                                                      "SGD",
+                                                      "SHP",
+                                                      "SLL",
+                                                      "SOS",
+                                                      "SPL",
+                                                      "SRD",
+                                                      "STD",
+                                                      "SVC",
+                                                      "SYP",
+                                                      "SZL",
+                                                      "THB",
+                                                      "TJS",
+                                                      "TMT",
+                                                      "TND",
+                                                      "TOP",
+                                                      "TRY",
+                                                      "TTD",
+                                                      "TVD",
+                                                      "TWD",
+                                                      "TZS",
+                                                      "UAH",
+                                                      "UGX",
+                                                      "USD",
+                                                      "UYU",
+                                                      "UZS",
+                                                      "VEF",
+                                                      "VND",
+                                                      "VUV",
+                                                      "WST",
+                                                      "XAF",
+                                                      "XCD",
+                                                      "XDR",
+                                                      "XOF",
+                                                      "XPF",
+                                                      "XTS",
+                                                      "XXX",
+                                                      "YER",
+                                                      "ZAR",
+                                                      "ZMW",
+                                                      "ZWD"
+                                                    ]
                                                   },
                                                   {
                                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -40510,9 +57076,176 @@
                                                           {
                                                             "title": "ActiveOrHistoricCurrencyCode",
                                                             "type": "string",
-                                                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                            "pattern": "^[A-Z]{3,3}$",
-                                                            "example": "USD"
+                                                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                            "example": "USD",
+                                                            "minLength": 3,
+                                                            "maxLength": 3,
+                                                            "enum": [
+                                                              "AED",
+                                                              "AFN",
+                                                              "ALL",
+                                                              "AMD",
+                                                              "ANG",
+                                                              "AOA",
+                                                              "ARS",
+                                                              "AUD",
+                                                              "AWG",
+                                                              "AZN",
+                                                              "BAM",
+                                                              "BBD",
+                                                              "BDT",
+                                                              "BGN",
+                                                              "BHD",
+                                                              "BIF",
+                                                              "BMD",
+                                                              "BND",
+                                                              "BOB",
+                                                              "BRL",
+                                                              "BSD",
+                                                              "BTN",
+                                                              "BWP",
+                                                              "BYN",
+                                                              "BZD",
+                                                              "CAD",
+                                                              "CDF",
+                                                              "CHF",
+                                                              "CLP",
+                                                              "CNY",
+                                                              "COP",
+                                                              "CRC",
+                                                              "CUC",
+                                                              "CUP",
+                                                              "CVE",
+                                                              "CZK",
+                                                              "DJF",
+                                                              "DKK",
+                                                              "DOP",
+                                                              "DZD",
+                                                              "EGP",
+                                                              "ERN",
+                                                              "ETB",
+                                                              "EUR",
+                                                              "FJD",
+                                                              "FKP",
+                                                              "GBP",
+                                                              "GEL",
+                                                              "GGP",
+                                                              "GHS",
+                                                              "GIP",
+                                                              "GMD",
+                                                              "GNF",
+                                                              "GTQ",
+                                                              "GYD",
+                                                              "HKD",
+                                                              "HNL",
+                                                              "HRK",
+                                                              "HTG",
+                                                              "HUF",
+                                                              "IDR",
+                                                              "ILS",
+                                                              "IMP",
+                                                              "INR",
+                                                              "IQD",
+                                                              "IRR",
+                                                              "ISK",
+                                                              "JEP",
+                                                              "JMD",
+                                                              "JOD",
+                                                              "JPY",
+                                                              "KES",
+                                                              "KGS",
+                                                              "KHR",
+                                                              "KMF",
+                                                              "KPW",
+                                                              "KRW",
+                                                              "KWD",
+                                                              "KYD",
+                                                              "KZT",
+                                                              "LAK",
+                                                              "LBP",
+                                                              "LKR",
+                                                              "LRD",
+                                                              "LSL",
+                                                              "LYD",
+                                                              "MAD",
+                                                              "MDL",
+                                                              "MGA",
+                                                              "MKD",
+                                                              "MMK",
+                                                              "MNT",
+                                                              "MOP",
+                                                              "MRO",
+                                                              "MUR",
+                                                              "MVR",
+                                                              "MWK",
+                                                              "MXN",
+                                                              "MYR",
+                                                              "MZN",
+                                                              "NAD",
+                                                              "NGN",
+                                                              "NIO",
+                                                              "NOK",
+                                                              "NPR",
+                                                              "NZD",
+                                                              "OMR",
+                                                              "PAB",
+                                                              "PEN",
+                                                              "PGK",
+                                                              "PHP",
+                                                              "PKR",
+                                                              "PLN",
+                                                              "PYG",
+                                                              "QAR",
+                                                              "RON",
+                                                              "RSD",
+                                                              "RUB",
+                                                              "RWF",
+                                                              "SAR",
+                                                              "SBD",
+                                                              "SCR",
+                                                              "SDG",
+                                                              "SEK",
+                                                              "SGD",
+                                                              "SHP",
+                                                              "SLL",
+                                                              "SOS",
+                                                              "SPL",
+                                                              "SRD",
+                                                              "STD",
+                                                              "SVC",
+                                                              "SYP",
+                                                              "SZL",
+                                                              "THB",
+                                                              "TJS",
+                                                              "TMT",
+                                                              "TND",
+                                                              "TOP",
+                                                              "TRY",
+                                                              "TTD",
+                                                              "TVD",
+                                                              "TWD",
+                                                              "TZS",
+                                                              "UAH",
+                                                              "UGX",
+                                                              "USD",
+                                                              "UYU",
+                                                              "UZS",
+                                                              "VEF",
+                                                              "VND",
+                                                              "VUV",
+                                                              "WST",
+                                                              "XAF",
+                                                              "XCD",
+                                                              "XDR",
+                                                              "XOF",
+                                                              "XPF",
+                                                              "XTS",
+                                                              "XXX",
+                                                              "YER",
+                                                              "ZAR",
+                                                              "ZMW",
+                                                              "ZWD"
+                                                            ]
                                                           },
                                                           {
                                                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -40703,614 +57436,1282 @@
                                                             {
                                                               "title": "ActiveOrHistoricCurrencyCode",
                                                               "type": "string",
-                                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                              "pattern": "^[A-Z]{3,3}$",
-                                                              "example": "USD"
-                                                            },
-                                                            {
-                                                              "description": "Currency\nIdentification of the currency in which the account is held.\n"
-                                                            }
-                                                          ]
-                                                        }
-                                                      },
-                                                      "required": [
-                                                        "ActiveOrHistoricCurrencyAndAmount",
-                                                        "Ccy"
-                                                      ],
-                                                      "example": {
-                                                        "ActiveOrHistoricCurrencyAndAmount": 123.45,
-                                                        "Ccy": "USD"
-                                                      }
-                                                    },
-                                                    {
-                                                      "description": "Amount\n\nUnderlying tax amount related to the specified period.\n"
-                                                    }
-                                                  ]
-                                                }
-                                              },
-                                              "required": [
-                                                "Amt"
-                                              ],
-                                              "example": {
-                                                "Prd": {
-                                                  "Yr": 2020,
-                                                  "Tp": "MM01",
-                                                  "FrToDt": {
-                                                    "FrDt": "2020-01-01",
-                                                    "ToDt": "2020-01-31"
-                                                  }
-                                                },
-                                                "Amt": {
-                                                  "Amt": 100,
-                                                  "Ccy": "EUR"
-                                                }
-                                              }
-                                            },
-                                            "type": "array"
-                                          }
-                                        ]
-                                      }
-                                    },
-                                    "example": {
-                                      "Rate": 0,
-                                      "TaxblBaseAmt": {
-                                        "Ccy": "EUR",
-                                        "Amt": 0
-                                      },
-                                      "TtlAmt": {
-                                        "Ccy": "EUR",
-                                        "Amt": 0
-                                      },
-                                      "Dtls": {
-                                        "Tp": "T1",
-                                        "Ctry": "CH",
-                                        "Cd": "CHF",
-                                        "Amt": {
-                                          "Ccy": "CHF",
-                                          "Amt": 1000
-                                        },
-                                        "Inf": 12345
-                                      }
-                                    }
-                                  },
-                                  {
-                                    "description": "TaxAmount\n\nSet of elements used to provide information on the amount of the tax record.\n"
-                                  }
-                                ]
-                              },
-                              "Tp": {
-                                "allOf": [
-                                  {
-                                    "title": "Max35Text",
-                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
-                                    "type": "string",
-                                    "minLength": 1,
-                                    "maxLength": 35,
-                                    "example": 1.234567890123457e+34
-                                  },
-                                  {
-                                    "description": "Type\n\nHigh level code to identify the type of tax details.\n"
-                                  }
-                                ]
-                              }
-                            },
-                            "example": {
-                              "Tp": "VAT",
-                              "Ctgy": "A",
-                              "CtgyDtls": "Standard",
-                              "DbtrSts": "Resident",
-                              "CertId": 123456789,
-                              "FrmsCd": 123456789,
-                              "Prd": {
-                                "Yr": 2019,
-                                "Tp": "MM01",
-                                "FrToDt": {
-                                  "FrDt": "2019-01-01",
-                                  "ToDt": "2019-12-31"
-                                }
-                              },
-                              "TaxAmt": {
-                                "Rate": 0.2,
-                                "TaxblBaseAmt": {
-                                  "Ccy": "EUR",
-                                  "Amt": 1000
-                                },
-                                "TtlAmt": {
-                                  "Ccy": "EUR",
-                                  "Amt": 200
-                                }
-                              },
-                              "AddtlInf": "VAT applicable"
-                            }
-                          },
-                          {
-                            "items": {
-                              "title": "TaxRecord3",
-                              "description": "Set of elements used to define the tax record.\n",
-                              "type": "object",
-                              "properties": {
-                                "AddtlInf": {
-                                  "allOf": [
-                                    {
-                                      "title": "Max140Text",
-                                      "description": "Specifies a character string with a maximum length of 140 characters.\n",
-                                      "type": "string",
-                                      "minLength": 1,
-                                      "maxLength": 140,
-                                      "example": 12345
-                                    },
-                                    {
-                                      "description": "AdditionalInformation\n\nFurther details of the tax record.\n"
-                                    }
-                                  ]
-                                },
-                                "CertId": {
-                                  "allOf": [
-                                    {
-                                      "title": "Max35Text",
-                                      "description": "Specifies a character string with a maximum length of 35 characters.\n",
-                                      "type": "string",
-                                      "minLength": 1,
-                                      "maxLength": 35,
-                                      "example": 1.234567890123457e+34
-                                    },
-                                    {
-                                      "description": "CertificateIdentification\n\nIdentification number of the tax report as assigned by the taxing authority.\n"
-                                    }
-                                  ]
-                                },
-                                "Ctgy": {
-                                  "allOf": [
-                                    {
-                                      "title": "Max35Text",
-                                      "description": "Specifies a character string with a maximum length of 35 characters.\n",
-                                      "type": "string",
-                                      "minLength": 1,
-                                      "maxLength": 35,
-                                      "example": 1.234567890123457e+34
-                                    },
-                                    {
-                                      "description": "Category\n\nSpecifies the tax code as published by the tax authority.\n"
-                                    }
-                                  ]
-                                },
-                                "CtgyDtls": {
-                                  "allOf": [
-                                    {
-                                      "title": "Max35Text",
-                                      "description": "Specifies a character string with a maximum length of 35 characters.\n",
-                                      "type": "string",
-                                      "minLength": 1,
-                                      "maxLength": 35,
-                                      "example": 1.234567890123457e+34
-                                    },
-                                    {
-                                      "description": "CategoryDetails\n\nProvides further details of the category tax code.\n"
-                                    }
-                                  ]
-                                },
-                                "DbtrSts": {
-                                  "allOf": [
-                                    {
-                                      "title": "Max35Text",
-                                      "description": "Specifies a character string with a maximum length of 35 characters.\n",
-                                      "type": "string",
-                                      "minLength": 1,
-                                      "maxLength": 35,
-                                      "example": 1.234567890123457e+34
-                                    },
-                                    {
-                                      "description": "DebtorStatus\n\nCode provided by local authority to identify the status of the party that has drawn up the settlement document.\n"
-                                    }
-                                  ]
-                                },
-                                "FrmsCd": {
-                                  "allOf": [
-                                    {
-                                      "title": "Max35Text",
-                                      "description": "Specifies a character string with a maximum length of 35 characters.\n",
-                                      "type": "string",
-                                      "minLength": 1,
-                                      "maxLength": 35,
-                                      "example": 1.234567890123457e+34
-                                    },
-                                    {
-                                      "description": "FormsCode\n\nIdentifies, in a coded form, on which template the tax report is to be provided.\n"
-                                    }
-                                  ]
-                                },
-                                "Prd": {
-                                  "allOf": [
-                                    {
-                                      "title": "TaxPeriod3",
-                                      "description": "Period of time details related to the tax payment.\n",
-                                      "type": "object",
-                                      "properties": {
-                                        "FrToDt": {
-                                          "allOf": [
-                                            {
-                                              "title": "DatePeriod2",
-                                              "description": "Range of time defined by a start date and an end date.\n",
-                                              "type": "object",
-                                              "properties": {
-                                                "FrDt": {
-                                                  "allOf": [
-                                                    {
-                                                      "title": "ISODate",
-                                                      "description": "A particular point in the progression of time in a calendar year expressed in the YYYY-MM-DD format. This representation is defined in \"XML Schema Part 2: Datatypes Second Edition - W3C Recommendation 28 October 2004\" which is aligned with ISO 8601.\n",
-                                                      "type": "string",
-                                                      "format": "date",
-                                                      "example": "2013-03-07"
-                                                    },
-                                                    {
-                                                      "description": "FromDate\nStart date of the range.\n"
-                                                    }
-                                                  ]
-                                                },
-                                                "ToDt": {
-                                                  "allOf": [
-                                                    {
-                                                      "title": "ISODate",
-                                                      "description": "A particular point in the progression of time in a calendar year expressed in the YYYY-MM-DD format. This representation is defined in \"XML Schema Part 2: Datatypes Second Edition - W3C Recommendation 28 October 2004\" which is aligned with ISO 8601.\n",
-                                                      "type": "string",
-                                                      "format": "date",
-                                                      "example": "2013-03-07"
-                                                    },
-                                                    {
-                                                      "description": "ToDate\nEnd date of the range.\n"
-                                                    }
-                                                  ]
-                                                }
-                                              },
-                                              "required": [
-                                                "FrDt",
-                                                "ToDt"
-                                              ],
-                                              "example": {
-                                                "FrDt": "2022-01-01",
-                                                "ToDt": "2022-12-31"
-                                              }
-                                            },
-                                            {
-                                              "description": "FromToDate\n\nRange of time between a start date and an end date for which the tax report is provided.\n"
-                                            }
-                                          ]
-                                        },
-                                        "Tp": {
-                                          "allOf": [
-                                            {
-                                              "title": "TaxRecordPeriod1Code",
-                                              "description": "Specifies the period related to the tax payment\n\nMM01 FirstMonth Tax is related to the second month of the period.\nMM02 SecondMonth Tax is related to the first month of the period.\nMM03 ThirdMonth Tax is related to the third month of the period.\nMM04 FourthMonth Tax is related to the fourth month of the period.\nMM05 FifthMonth Tax is related to the fifth month of the period.\nMM06 SixthMonth Tax is related to the sixth month of the period.\nMM07 SeventhMonth Tax is related to the seventh month of the period.\nMM08 EighthMonth Tax is related to the eighth month of the period.\nMM09 NinthMonth Tax is related to the ninth month of the period.\nMM10 TenthMonth Tax is related to the tenth month of the period.\nMM11 EleventhMonth Tax is related to the eleventh month of the period.\nMM12 TwelfthMonth Tax is related to the twelfth month of the period.\nQTR1 FirstQuarter Tax is related to the first quarter of the period.\nQTR2 SecondQuarter Tax is related to the second quarter of the period.\nQTR3 ThirdQuarter Tax is related to the third quarter of the period.\nQTR4 FourthQuarter Tax is related to the forth quarter of the period.\nHLF1 FirstHalf Tax is related to the first half of the period.\nHLF2 SecondHalf Tax is related to the second half of the period.\n",
-                                              "type": "string",
-                                              "enum": [
-                                                "MM01",
-                                                "MM02",
-                                                "MM03",
-                                                "MM04",
-                                                "MM05",
-                                                "MM06",
-                                                "MM07",
-                                                "MM08",
-                                                "MM09",
-                                                "MM10",
-                                                "MM11",
-                                                "MM12",
-                                                "QTR1",
-                                                "QTR2",
-                                                "QTR3",
-                                                "QTR4",
-                                                "HLF1",
-                                                "HLF2"
-                                              ],
-                                              "example": "HLF1"
-                                            },
-                                            {
-                                              "description": "Type\n\nIdentification of the period related to the tax payment.\n"
-                                            }
-                                          ]
-                                        },
-                                        "Yr": {
-                                          "allOf": [
-                                            {
-                                              "title": "ISOYear",
-                                              "description": "Year represented by YYYY (ISO 8601).\n",
-                                              "type": "string",
-                                              "pattern": "^\\d{4}(Z|([+-]\\d{2}:\\d{2})){0,1}$",
-                                              "example": 2019
-                                            },
-                                            {
-                                              "description": "Year\n\nYear related to the tax payment.\n"
-                                            }
-                                          ]
-                                        }
-                                      },
-                                      "example": {
-                                        "Yr": 2020,
-                                        "Tp": "MM01",
-                                        "FrToDt": {
-                                          "FrDt": "2020-01-01",
-                                          "ToDt": "2020-01-31"
-                                        }
-                                      }
-                                    },
-                                    {
-                                      "description": "Period\n\nSet of elements used to provide details on the period of time related to the tax payment.\n"
-                                    }
-                                  ]
-                                },
-                                "TaxAmt": {
-                                  "allOf": [
-                                    {
-                                      "title": "TaxAmount3",
-                                      "description": "Information on the amount of the tax record.\n",
-                                      "type": "object",
-                                      "properties": {
-                                        "Rate": {
-                                          "allOf": [
-                                            {
-                                              "title": "PercentageRate",
-                                              "type": "string",
-                                              "example": 1234,
-                                              "pattern": "^(?!0\\d)(\\d{1,11}|\\d{1,10}.\\d{1}|\\d{1,9}.\\d{1,2}|\\d{1,8}.\\d{1,3}|\\d{1,7}.\\d{1,4}|\\d{1,6}.\\d{1,5}|\\d{1,5}.\\d{1,6}|\\d{1,4}.\\d{1,7}|\\d{1,3}.\\d{1,8}|\\d{1,2}.\\d{1,9}|\\d{1}.\\d{1,10})$"
-                                            },
-                                            {
-                                              "description": "Rate\n\nRate used to calculate the tax.\n"
-                                            }
-                                          ]
-                                        },
-                                        "TaxblBaseAmt": {
-                                          "allOf": [
-                                            {
-                                              "title": "ActiveOrHistoricCurrencyAndAmount",
-                                              "type": "object",
-                                              "description": "A number of monetary units specified in an active or a historic currency where the unit of currency is explicit and compliant with ISO 4217.\n",
-                                              "properties": {
-                                                "ActiveOrHistoricCurrencyAndAmount": {
-                                                  "allOf": [
-                                                    {
-                                                      "title": "ActiveOrHistoricCurrencyAndAmount_SimpleType",
-                                                      "type": "string",
-                                                      "example": 123.45,
-                                                      "pattern": "^(?!0\\d)(\\d{1,18}|\\d{1,17}.\\d{1}|\\d{1,16}.\\d{1,2}|\\d{1,15}.\\d{1,3}|\\d{1,14}.\\d{1,4}|\\d{1,13}.\\d{1,5})$"
-                                                    },
-                                                    {
-                                                      "description": "Amount of money to be moved between the debtor and creditor, before deduction of charges, expressed in the currency as ordered by the initiating party.\n"
-                                                    }
-                                                  ]
-                                                },
-                                                "Ccy": {
-                                                  "allOf": [
-                                                    {
-                                                      "title": "ActiveOrHistoricCurrencyCode",
-                                                      "type": "string",
-                                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                      "pattern": "^[A-Z]{3,3}$",
-                                                      "example": "USD"
-                                                    },
-                                                    {
-                                                      "description": "Currency\nIdentification of the currency in which the account is held.\n"
-                                                    }
-                                                  ]
-                                                }
-                                              },
-                                              "required": [
-                                                "ActiveOrHistoricCurrencyAndAmount",
-                                                "Ccy"
-                                              ],
-                                              "example": {
-                                                "ActiveOrHistoricCurrencyAndAmount": 123.45,
-                                                "Ccy": "USD"
-                                              }
-                                            },
-                                            {
-                                              "description": "TaxableBaseAmount\n\nAmount of money on which the tax is based.\n"
-                                            }
-                                          ]
-                                        },
-                                        "TtlAmt": {
-                                          "allOf": [
-                                            {
-                                              "title": "ActiveOrHistoricCurrencyAndAmount",
-                                              "type": "object",
-                                              "description": "A number of monetary units specified in an active or a historic currency where the unit of currency is explicit and compliant with ISO 4217.\n",
-                                              "properties": {
-                                                "ActiveOrHistoricCurrencyAndAmount": {
-                                                  "allOf": [
-                                                    {
-                                                      "title": "ActiveOrHistoricCurrencyAndAmount_SimpleType",
-                                                      "type": "string",
-                                                      "example": 123.45,
-                                                      "pattern": "^(?!0\\d)(\\d{1,18}|\\d{1,17}.\\d{1}|\\d{1,16}.\\d{1,2}|\\d{1,15}.\\d{1,3}|\\d{1,14}.\\d{1,4}|\\d{1,13}.\\d{1,5})$"
-                                                    },
-                                                    {
-                                                      "description": "Amount of money to be moved between the debtor and creditor, before deduction of charges, expressed in the currency as ordered by the initiating party.\n"
-                                                    }
-                                                  ]
-                                                },
-                                                "Ccy": {
-                                                  "allOf": [
-                                                    {
-                                                      "title": "ActiveOrHistoricCurrencyCode",
-                                                      "type": "string",
-                                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                      "pattern": "^[A-Z]{3,3}$",
-                                                      "example": "USD"
-                                                    },
-                                                    {
-                                                      "description": "Currency\nIdentification of the currency in which the account is held.\n"
-                                                    }
-                                                  ]
-                                                }
-                                              },
-                                              "required": [
-                                                "ActiveOrHistoricCurrencyAndAmount",
-                                                "Ccy"
-                                              ],
-                                              "example": {
-                                                "ActiveOrHistoricCurrencyAndAmount": 123.45,
-                                                "Ccy": "USD"
-                                              }
-                                            },
-                                            {
-                                              "description": "TotalAmount\n\nTotal amount that is the result of the calculation of the tax for the record.\n"
-                                            }
-                                          ]
-                                        },
-                                        "Dtls": {
-                                          "description": "Details\n\nSet of elements used to provide details on the tax period and amount.\n",
-                                          "anyOf": [
-                                            {
-                                              "title": "TaxRecordDetails3",
-                                              "description": "Details on the tax period and amount.\n",
-                                              "type": "object",
-                                              "properties": {
-                                                "Prd": {
-                                                  "allOf": [
-                                                    {
-                                                      "title": "TaxPeriod3",
-                                                      "description": "Period of time details related to the tax payment.\n",
-                                                      "type": "object",
-                                                      "properties": {
-                                                        "FrToDt": {
-                                                          "allOf": [
-                                                            {
-                                                              "title": "DatePeriod2",
-                                                              "description": "Range of time defined by a start date and an end date.\n",
-                                                              "type": "object",
-                                                              "properties": {
-                                                                "FrDt": {
-                                                                  "allOf": [
-                                                                    {
-                                                                      "title": "ISODate",
-                                                                      "description": "A particular point in the progression of time in a calendar year expressed in the YYYY-MM-DD format. This representation is defined in \"XML Schema Part 2: Datatypes Second Edition - W3C Recommendation 28 October 2004\" which is aligned with ISO 8601.\n",
-                                                                      "type": "string",
-                                                                      "format": "date",
-                                                                      "example": "2013-03-07"
-                                                                    },
-                                                                    {
-                                                                      "description": "FromDate\nStart date of the range.\n"
-                                                                    }
-                                                                  ]
-                                                                },
-                                                                "ToDt": {
-                                                                  "allOf": [
-                                                                    {
-                                                                      "title": "ISODate",
-                                                                      "description": "A particular point in the progression of time in a calendar year expressed in the YYYY-MM-DD format. This representation is defined in \"XML Schema Part 2: Datatypes Second Edition - W3C Recommendation 28 October 2004\" which is aligned with ISO 8601.\n",
-                                                                      "type": "string",
-                                                                      "format": "date",
-                                                                      "example": "2013-03-07"
-                                                                    },
-                                                                    {
-                                                                      "description": "ToDate\nEnd date of the range.\n"
-                                                                    }
-                                                                  ]
-                                                                }
-                                                              },
-                                                              "required": [
-                                                                "FrDt",
-                                                                "ToDt"
-                                                              ],
-                                                              "example": {
-                                                                "FrDt": "2022-01-01",
-                                                                "ToDt": "2022-12-31"
-                                                              }
-                                                            },
-                                                            {
-                                                              "description": "FromToDate\n\nRange of time between a start date and an end date for which the tax report is provided.\n"
-                                                            }
-                                                          ]
-                                                        },
-                                                        "Tp": {
-                                                          "allOf": [
-                                                            {
-                                                              "title": "TaxRecordPeriod1Code",
-                                                              "description": "Specifies the period related to the tax payment\n\nMM01 FirstMonth Tax is related to the second month of the period.\nMM02 SecondMonth Tax is related to the first month of the period.\nMM03 ThirdMonth Tax is related to the third month of the period.\nMM04 FourthMonth Tax is related to the fourth month of the period.\nMM05 FifthMonth Tax is related to the fifth month of the period.\nMM06 SixthMonth Tax is related to the sixth month of the period.\nMM07 SeventhMonth Tax is related to the seventh month of the period.\nMM08 EighthMonth Tax is related to the eighth month of the period.\nMM09 NinthMonth Tax is related to the ninth month of the period.\nMM10 TenthMonth Tax is related to the tenth month of the period.\nMM11 EleventhMonth Tax is related to the eleventh month of the period.\nMM12 TwelfthMonth Tax is related to the twelfth month of the period.\nQTR1 FirstQuarter Tax is related to the first quarter of the period.\nQTR2 SecondQuarter Tax is related to the second quarter of the period.\nQTR3 ThirdQuarter Tax is related to the third quarter of the period.\nQTR4 FourthQuarter Tax is related to the forth quarter of the period.\nHLF1 FirstHalf Tax is related to the first half of the period.\nHLF2 SecondHalf Tax is related to the second half of the period.\n",
-                                                              "type": "string",
+                                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                              "example": "USD",
+                                                              "minLength": 3,
+                                                              "maxLength": 3,
+                                                              "enum": [
+                                                                "AED",
+                                                                "AFN",
+                                                                "ALL",
+                                                                "AMD",
+                                                                "ANG",
+                                                                "AOA",
+                                                                "ARS",
+                                                                "AUD",
+                                                                "AWG",
+                                                                "AZN",
+                                                                "BAM",
+                                                                "BBD",
+                                                                "BDT",
+                                                                "BGN",
+                                                                "BHD",
+                                                                "BIF",
+                                                                "BMD",
+                                                                "BND",
+                                                                "BOB",
+                                                                "BRL",
+                                                                "BSD",
+                                                                "BTN",
+                                                                "BWP",
+                                                                "BYN",
+                                                                "BZD",
+                                                                "CAD",
+                                                                "CDF",
+                                                                "CHF",
+                                                                "CLP",
+                                                                "CNY",
+                                                                "COP",
+                                                                "CRC",
+                                                                "CUC",
+                                                                "CUP",
+                                                                "CVE",
+                                                                "CZK",
+                                                                "DJF",
+                                                                "DKK",
+                                                                "DOP",
+                                                                "DZD",
+                                                                "EGP",
+                                                                "ERN",
+                                                                "ETB",
+                                                                "EUR",
+                                                                "FJD",
+                                                                "FKP",
+                                                                "GBP",
+                                                                "GEL",
+                                                                "GGP",
+                                                                "GHS",
+                                                                "GIP",
+                                                                "GMD",
+                                                                "GNF",
+                                                                "GTQ",
+                                                                "GYD",
+                                                                "HKD",
+                                                                "HNL",
+                                                                "HRK",
+                                                                "HTG",
+                                                                "HUF",
+                                                                "IDR",
+                                                                "ILS",
+                                                                "IMP",
+                                                                "INR",
+                                                                "IQD",
+                                                                "IRR",
+                                                                "ISK",
+                                                                "JEP",
+                                                                "JMD",
+                                                                "JOD",
+                                                                "JPY",
+                                                                "KES",
+                                                                "KGS",
+                                                                "KHR",
+                                                                "KMF",
+                                                                "KPW",
+                                                                "KRW",
+                                                                "KWD",
+                                                                "KYD",
+                                                                "KZT",
+                                                                "LAK",
+                                                                "LBP",
+                                                                "LKR",
+                                                                "LRD",
+                                                                "LSL",
+                                                                "LYD",
+                                                                "MAD",
+                                                                "MDL",
+                                                                "MGA",
+                                                                "MKD",
+                                                                "MMK",
+                                                                "MNT",
+                                                                "MOP",
+                                                                "MRO",
+                                                                "MUR",
+                                                                "MVR",
+                                                                "MWK",
+                                                                "MXN",
+                                                                "MYR",
+                                                                "MZN",
+                                                                "NAD",
+                                                                "NGN",
+                                                                "NIO",
+                                                                "NOK",
+                                                                "NPR",
+                                                                "NZD",
+                                                                "OMR",
+                                                                "PAB",
+                                                                "PEN",
+                                                                "PGK",
+                                                                "PHP",
+                                                                "PKR",
+                                                                "PLN",
+                                                                "PYG",
+                                                                "QAR",
+                                                                "RON",
+                                                                "RSD",
+                                                                "RUB",
+                                                                "RWF",
+                                                                "SAR",
+                                                                "SBD",
+                                                                "SCR",
+                                                                "SDG",
+                                                                "SEK",
+                                                                "SGD",
+                                                                "SHP",
+                                                                "SLL",
+                                                                "SOS",
+                                                                "SPL",
+                                                                "SRD",
+                                                                "STD",
+                                                                "SVC",
+                                                                "SYP",
+                                                                "SZL",
+                                                                "THB",
+                                                                "TJS",
+                                                                "TMT",
+                                                                "TND",
+                                                                "TOP",
+                                                                "TRY",
+                                                                "TTD",
+                                                                "TVD",
+                                                                "TWD",
+                                                                "TZS",
+                                                                "UAH",
+                                                                "UGX",
+                                                                "USD",
+                                                                "UYU",
+                                                                "UZS",
+                                                                "VEF",
+                                                                "VND",
+                                                                "VUV",
+                                                                "WST",
+                                                                "XAF",
+                                                                "XCD",
+                                                                "XDR",
+                                                                "XOF",
+                                                                "XPF",
+                                                                "XTS",
+                                                                "XXX",
+                                                                "YER",
+                                                                "ZAR",
+                                                                "ZMW",
+                                                                "ZWD"
+                                                              ]
+                                                            },
+                                                            {
+                                                              "description": "Currency\nIdentification of the currency in which the account is held.\n"
+                                                            }
+                                                          ]
+                                                        }
+                                                      },
+                                                      "required": [
+                                                        "ActiveOrHistoricCurrencyAndAmount",
+                                                        "Ccy"
+                                                      ],
+                                                      "example": {
+                                                        "ActiveOrHistoricCurrencyAndAmount": 123.45,
+                                                        "Ccy": "USD"
+                                                      }
+                                                    },
+                                                    {
+                                                      "description": "Amount\n\nUnderlying tax amount related to the specified period.\n"
+                                                    }
+                                                  ]
+                                                }
+                                              },
+                                              "required": [
+                                                "Amt"
+                                              ],
+                                              "example": {
+                                                "Prd": {
+                                                  "Yr": 2020,
+                                                  "Tp": "MM01",
+                                                  "FrToDt": {
+                                                    "FrDt": "2020-01-01",
+                                                    "ToDt": "2020-01-31"
+                                                  }
+                                                },
+                                                "Amt": {
+                                                  "Amt": 100,
+                                                  "Ccy": "EUR"
+                                                }
+                                              }
+                                            },
+                                            "type": "array"
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "example": {
+                                      "Rate": 0,
+                                      "TaxblBaseAmt": {
+                                        "Ccy": "EUR",
+                                        "Amt": 0
+                                      },
+                                      "TtlAmt": {
+                                        "Ccy": "EUR",
+                                        "Amt": 0
+                                      },
+                                      "Dtls": {
+                                        "Tp": "T1",
+                                        "Ctry": "CH",
+                                        "Cd": "CHF",
+                                        "Amt": {
+                                          "Ccy": "CHF",
+                                          "Amt": 1000
+                                        },
+                                        "Inf": 12345
+                                      }
+                                    }
+                                  },
+                                  {
+                                    "description": "TaxAmount\n\nSet of elements used to provide information on the amount of the tax record.\n"
+                                  }
+                                ]
+                              },
+                              "Tp": {
+                                "allOf": [
+                                  {
+                                    "title": "Max35Text",
+                                    "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "maxLength": 35,
+                                    "example": 1.234567890123457e+34
+                                  },
+                                  {
+                                    "description": "Type\n\nHigh level code to identify the type of tax details.\n"
+                                  }
+                                ]
+                              }
+                            },
+                            "example": {
+                              "Tp": "VAT",
+                              "Ctgy": "A",
+                              "CtgyDtls": "Standard",
+                              "DbtrSts": "Resident",
+                              "CertId": 123456789,
+                              "FrmsCd": 123456789,
+                              "Prd": {
+                                "Yr": 2019,
+                                "Tp": "MM01",
+                                "FrToDt": {
+                                  "FrDt": "2019-01-01",
+                                  "ToDt": "2019-12-31"
+                                }
+                              },
+                              "TaxAmt": {
+                                "Rate": 0.2,
+                                "TaxblBaseAmt": {
+                                  "Ccy": "EUR",
+                                  "Amt": 1000
+                                },
+                                "TtlAmt": {
+                                  "Ccy": "EUR",
+                                  "Amt": 200
+                                }
+                              },
+                              "AddtlInf": "VAT applicable"
+                            }
+                          },
+                          {
+                            "items": {
+                              "title": "TaxRecord3",
+                              "description": "Set of elements used to define the tax record.\n",
+                              "type": "object",
+                              "properties": {
+                                "AddtlInf": {
+                                  "allOf": [
+                                    {
+                                      "title": "Max140Text",
+                                      "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                                      "type": "string",
+                                      "minLength": 1,
+                                      "maxLength": 140,
+                                      "example": 12345
+                                    },
+                                    {
+                                      "description": "AdditionalInformation\n\nFurther details of the tax record.\n"
+                                    }
+                                  ]
+                                },
+                                "CertId": {
+                                  "allOf": [
+                                    {
+                                      "title": "Max35Text",
+                                      "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                      "type": "string",
+                                      "minLength": 1,
+                                      "maxLength": 35,
+                                      "example": 1.234567890123457e+34
+                                    },
+                                    {
+                                      "description": "CertificateIdentification\n\nIdentification number of the tax report as assigned by the taxing authority.\n"
+                                    }
+                                  ]
+                                },
+                                "Ctgy": {
+                                  "allOf": [
+                                    {
+                                      "title": "Max35Text",
+                                      "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                      "type": "string",
+                                      "minLength": 1,
+                                      "maxLength": 35,
+                                      "example": 1.234567890123457e+34
+                                    },
+                                    {
+                                      "description": "Category\n\nSpecifies the tax code as published by the tax authority.\n"
+                                    }
+                                  ]
+                                },
+                                "CtgyDtls": {
+                                  "allOf": [
+                                    {
+                                      "title": "Max35Text",
+                                      "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                      "type": "string",
+                                      "minLength": 1,
+                                      "maxLength": 35,
+                                      "example": 1.234567890123457e+34
+                                    },
+                                    {
+                                      "description": "CategoryDetails\n\nProvides further details of the category tax code.\n"
+                                    }
+                                  ]
+                                },
+                                "DbtrSts": {
+                                  "allOf": [
+                                    {
+                                      "title": "Max35Text",
+                                      "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                      "type": "string",
+                                      "minLength": 1,
+                                      "maxLength": 35,
+                                      "example": 1.234567890123457e+34
+                                    },
+                                    {
+                                      "description": "DebtorStatus\n\nCode provided by local authority to identify the status of the party that has drawn up the settlement document.\n"
+                                    }
+                                  ]
+                                },
+                                "FrmsCd": {
+                                  "allOf": [
+                                    {
+                                      "title": "Max35Text",
+                                      "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                                      "type": "string",
+                                      "minLength": 1,
+                                      "maxLength": 35,
+                                      "example": 1.234567890123457e+34
+                                    },
+                                    {
+                                      "description": "FormsCode\n\nIdentifies, in a coded form, on which template the tax report is to be provided.\n"
+                                    }
+                                  ]
+                                },
+                                "Prd": {
+                                  "allOf": [
+                                    {
+                                      "title": "TaxPeriod3",
+                                      "description": "Period of time details related to the tax payment.\n",
+                                      "type": "object",
+                                      "properties": {
+                                        "FrToDt": {
+                                          "allOf": [
+                                            {
+                                              "title": "DatePeriod2",
+                                              "description": "Range of time defined by a start date and an end date.\n",
+                                              "type": "object",
+                                              "properties": {
+                                                "FrDt": {
+                                                  "allOf": [
+                                                    {
+                                                      "title": "ISODate",
+                                                      "description": "A particular point in the progression of time in a calendar year expressed in the YYYY-MM-DD format. This representation is defined in \"XML Schema Part 2: Datatypes Second Edition - W3C Recommendation 28 October 2004\" which is aligned with ISO 8601.\n",
+                                                      "type": "string",
+                                                      "format": "date",
+                                                      "example": "2013-03-07"
+                                                    },
+                                                    {
+                                                      "description": "FromDate\nStart date of the range.\n"
+                                                    }
+                                                  ]
+                                                },
+                                                "ToDt": {
+                                                  "allOf": [
+                                                    {
+                                                      "title": "ISODate",
+                                                      "description": "A particular point in the progression of time in a calendar year expressed in the YYYY-MM-DD format. This representation is defined in \"XML Schema Part 2: Datatypes Second Edition - W3C Recommendation 28 October 2004\" which is aligned with ISO 8601.\n",
+                                                      "type": "string",
+                                                      "format": "date",
+                                                      "example": "2013-03-07"
+                                                    },
+                                                    {
+                                                      "description": "ToDate\nEnd date of the range.\n"
+                                                    }
+                                                  ]
+                                                }
+                                              },
+                                              "required": [
+                                                "FrDt",
+                                                "ToDt"
+                                              ],
+                                              "example": {
+                                                "FrDt": "2022-01-01",
+                                                "ToDt": "2022-12-31"
+                                              }
+                                            },
+                                            {
+                                              "description": "FromToDate\n\nRange of time between a start date and an end date for which the tax report is provided.\n"
+                                            }
+                                          ]
+                                        },
+                                        "Tp": {
+                                          "allOf": [
+                                            {
+                                              "title": "TaxRecordPeriod1Code",
+                                              "description": "Specifies the period related to the tax payment\n\nMM01 FirstMonth Tax is related to the second month of the period.\nMM02 SecondMonth Tax is related to the first month of the period.\nMM03 ThirdMonth Tax is related to the third month of the period.\nMM04 FourthMonth Tax is related to the fourth month of the period.\nMM05 FifthMonth Tax is related to the fifth month of the period.\nMM06 SixthMonth Tax is related to the sixth month of the period.\nMM07 SeventhMonth Tax is related to the seventh month of the period.\nMM08 EighthMonth Tax is related to the eighth month of the period.\nMM09 NinthMonth Tax is related to the ninth month of the period.\nMM10 TenthMonth Tax is related to the tenth month of the period.\nMM11 EleventhMonth Tax is related to the eleventh month of the period.\nMM12 TwelfthMonth Tax is related to the twelfth month of the period.\nQTR1 FirstQuarter Tax is related to the first quarter of the period.\nQTR2 SecondQuarter Tax is related to the second quarter of the period.\nQTR3 ThirdQuarter Tax is related to the third quarter of the period.\nQTR4 FourthQuarter Tax is related to the forth quarter of the period.\nHLF1 FirstHalf Tax is related to the first half of the period.\nHLF2 SecondHalf Tax is related to the second half of the period.\n",
+                                              "type": "string",
+                                              "enum": [
+                                                "MM01",
+                                                "MM02",
+                                                "MM03",
+                                                "MM04",
+                                                "MM05",
+                                                "MM06",
+                                                "MM07",
+                                                "MM08",
+                                                "MM09",
+                                                "MM10",
+                                                "MM11",
+                                                "MM12",
+                                                "QTR1",
+                                                "QTR2",
+                                                "QTR3",
+                                                "QTR4",
+                                                "HLF1",
+                                                "HLF2"
+                                              ],
+                                              "example": "HLF1"
+                                            },
+                                            {
+                                              "description": "Type\n\nIdentification of the period related to the tax payment.\n"
+                                            }
+                                          ]
+                                        },
+                                        "Yr": {
+                                          "allOf": [
+                                            {
+                                              "title": "ISOYear",
+                                              "description": "Year represented by YYYY (ISO 8601).\n",
+                                              "type": "string",
+                                              "pattern": "^\\d{4}(Z|([+-]\\d{2}:\\d{2})){0,1}$",
+                                              "example": 2019
+                                            },
+                                            {
+                                              "description": "Year\n\nYear related to the tax payment.\n"
+                                            }
+                                          ]
+                                        }
+                                      },
+                                      "example": {
+                                        "Yr": 2020,
+                                        "Tp": "MM01",
+                                        "FrToDt": {
+                                          "FrDt": "2020-01-01",
+                                          "ToDt": "2020-01-31"
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "description": "Period\n\nSet of elements used to provide details on the period of time related to the tax payment.\n"
+                                    }
+                                  ]
+                                },
+                                "TaxAmt": {
+                                  "allOf": [
+                                    {
+                                      "title": "TaxAmount3",
+                                      "description": "Information on the amount of the tax record.\n",
+                                      "type": "object",
+                                      "properties": {
+                                        "Rate": {
+                                          "allOf": [
+                                            {
+                                              "title": "PercentageRate",
+                                              "type": "string",
+                                              "example": 1234,
+                                              "pattern": "^(?!0\\d)(\\d{1,11}|\\d{1,10}.\\d{1}|\\d{1,9}.\\d{1,2}|\\d{1,8}.\\d{1,3}|\\d{1,7}.\\d{1,4}|\\d{1,6}.\\d{1,5}|\\d{1,5}.\\d{1,6}|\\d{1,4}.\\d{1,7}|\\d{1,3}.\\d{1,8}|\\d{1,2}.\\d{1,9}|\\d{1}.\\d{1,10})$"
+                                            },
+                                            {
+                                              "description": "Rate\n\nRate used to calculate the tax.\n"
+                                            }
+                                          ]
+                                        },
+                                        "TaxblBaseAmt": {
+                                          "allOf": [
+                                            {
+                                              "title": "ActiveOrHistoricCurrencyAndAmount",
+                                              "type": "object",
+                                              "description": "A number of monetary units specified in an active or a historic currency where the unit of currency is explicit and compliant with ISO 4217.\n",
+                                              "properties": {
+                                                "ActiveOrHistoricCurrencyAndAmount": {
+                                                  "allOf": [
+                                                    {
+                                                      "title": "ActiveOrHistoricCurrencyAndAmount_SimpleType",
+                                                      "type": "string",
+                                                      "example": 123.45,
+                                                      "pattern": "^(?!0\\d)(\\d{1,18}|\\d{1,17}.\\d{1}|\\d{1,16}.\\d{1,2}|\\d{1,15}.\\d{1,3}|\\d{1,14}.\\d{1,4}|\\d{1,13}.\\d{1,5})$"
+                                                    },
+                                                    {
+                                                      "description": "Amount of money to be moved between the debtor and creditor, before deduction of charges, expressed in the currency as ordered by the initiating party.\n"
+                                                    }
+                                                  ]
+                                                },
+                                                "Ccy": {
+                                                  "allOf": [
+                                                    {
+                                                      "title": "ActiveOrHistoricCurrencyCode",
+                                                      "type": "string",
+                                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                      "example": "USD",
+                                                      "minLength": 3,
+                                                      "maxLength": 3,
+                                                      "enum": [
+                                                        "AED",
+                                                        "AFN",
+                                                        "ALL",
+                                                        "AMD",
+                                                        "ANG",
+                                                        "AOA",
+                                                        "ARS",
+                                                        "AUD",
+                                                        "AWG",
+                                                        "AZN",
+                                                        "BAM",
+                                                        "BBD",
+                                                        "BDT",
+                                                        "BGN",
+                                                        "BHD",
+                                                        "BIF",
+                                                        "BMD",
+                                                        "BND",
+                                                        "BOB",
+                                                        "BRL",
+                                                        "BSD",
+                                                        "BTN",
+                                                        "BWP",
+                                                        "BYN",
+                                                        "BZD",
+                                                        "CAD",
+                                                        "CDF",
+                                                        "CHF",
+                                                        "CLP",
+                                                        "CNY",
+                                                        "COP",
+                                                        "CRC",
+                                                        "CUC",
+                                                        "CUP",
+                                                        "CVE",
+                                                        "CZK",
+                                                        "DJF",
+                                                        "DKK",
+                                                        "DOP",
+                                                        "DZD",
+                                                        "EGP",
+                                                        "ERN",
+                                                        "ETB",
+                                                        "EUR",
+                                                        "FJD",
+                                                        "FKP",
+                                                        "GBP",
+                                                        "GEL",
+                                                        "GGP",
+                                                        "GHS",
+                                                        "GIP",
+                                                        "GMD",
+                                                        "GNF",
+                                                        "GTQ",
+                                                        "GYD",
+                                                        "HKD",
+                                                        "HNL",
+                                                        "HRK",
+                                                        "HTG",
+                                                        "HUF",
+                                                        "IDR",
+                                                        "ILS",
+                                                        "IMP",
+                                                        "INR",
+                                                        "IQD",
+                                                        "IRR",
+                                                        "ISK",
+                                                        "JEP",
+                                                        "JMD",
+                                                        "JOD",
+                                                        "JPY",
+                                                        "KES",
+                                                        "KGS",
+                                                        "KHR",
+                                                        "KMF",
+                                                        "KPW",
+                                                        "KRW",
+                                                        "KWD",
+                                                        "KYD",
+                                                        "KZT",
+                                                        "LAK",
+                                                        "LBP",
+                                                        "LKR",
+                                                        "LRD",
+                                                        "LSL",
+                                                        "LYD",
+                                                        "MAD",
+                                                        "MDL",
+                                                        "MGA",
+                                                        "MKD",
+                                                        "MMK",
+                                                        "MNT",
+                                                        "MOP",
+                                                        "MRO",
+                                                        "MUR",
+                                                        "MVR",
+                                                        "MWK",
+                                                        "MXN",
+                                                        "MYR",
+                                                        "MZN",
+                                                        "NAD",
+                                                        "NGN",
+                                                        "NIO",
+                                                        "NOK",
+                                                        "NPR",
+                                                        "NZD",
+                                                        "OMR",
+                                                        "PAB",
+                                                        "PEN",
+                                                        "PGK",
+                                                        "PHP",
+                                                        "PKR",
+                                                        "PLN",
+                                                        "PYG",
+                                                        "QAR",
+                                                        "RON",
+                                                        "RSD",
+                                                        "RUB",
+                                                        "RWF",
+                                                        "SAR",
+                                                        "SBD",
+                                                        "SCR",
+                                                        "SDG",
+                                                        "SEK",
+                                                        "SGD",
+                                                        "SHP",
+                                                        "SLL",
+                                                        "SOS",
+                                                        "SPL",
+                                                        "SRD",
+                                                        "STD",
+                                                        "SVC",
+                                                        "SYP",
+                                                        "SZL",
+                                                        "THB",
+                                                        "TJS",
+                                                        "TMT",
+                                                        "TND",
+                                                        "TOP",
+                                                        "TRY",
+                                                        "TTD",
+                                                        "TVD",
+                                                        "TWD",
+                                                        "TZS",
+                                                        "UAH",
+                                                        "UGX",
+                                                        "USD",
+                                                        "UYU",
+                                                        "UZS",
+                                                        "VEF",
+                                                        "VND",
+                                                        "VUV",
+                                                        "WST",
+                                                        "XAF",
+                                                        "XCD",
+                                                        "XDR",
+                                                        "XOF",
+                                                        "XPF",
+                                                        "XTS",
+                                                        "XXX",
+                                                        "YER",
+                                                        "ZAR",
+                                                        "ZMW",
+                                                        "ZWD"
+                                                      ]
+                                                    },
+                                                    {
+                                                      "description": "Currency\nIdentification of the currency in which the account is held.\n"
+                                                    }
+                                                  ]
+                                                }
+                                              },
+                                              "required": [
+                                                "ActiveOrHistoricCurrencyAndAmount",
+                                                "Ccy"
+                                              ],
+                                              "example": {
+                                                "ActiveOrHistoricCurrencyAndAmount": 123.45,
+                                                "Ccy": "USD"
+                                              }
+                                            },
+                                            {
+                                              "description": "TaxableBaseAmount\n\nAmount of money on which the tax is based.\n"
+                                            }
+                                          ]
+                                        },
+                                        "TtlAmt": {
+                                          "allOf": [
+                                            {
+                                              "title": "ActiveOrHistoricCurrencyAndAmount",
+                                              "type": "object",
+                                              "description": "A number of monetary units specified in an active or a historic currency where the unit of currency is explicit and compliant with ISO 4217.\n",
+                                              "properties": {
+                                                "ActiveOrHistoricCurrencyAndAmount": {
+                                                  "allOf": [
+                                                    {
+                                                      "title": "ActiveOrHistoricCurrencyAndAmount_SimpleType",
+                                                      "type": "string",
+                                                      "example": 123.45,
+                                                      "pattern": "^(?!0\\d)(\\d{1,18}|\\d{1,17}.\\d{1}|\\d{1,16}.\\d{1,2}|\\d{1,15}.\\d{1,3}|\\d{1,14}.\\d{1,4}|\\d{1,13}.\\d{1,5})$"
+                                                    },
+                                                    {
+                                                      "description": "Amount of money to be moved between the debtor and creditor, before deduction of charges, expressed in the currency as ordered by the initiating party.\n"
+                                                    }
+                                                  ]
+                                                },
+                                                "Ccy": {
+                                                  "allOf": [
+                                                    {
+                                                      "title": "ActiveOrHistoricCurrencyCode",
+                                                      "type": "string",
+                                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                      "example": "USD",
+                                                      "minLength": 3,
+                                                      "maxLength": 3,
+                                                      "enum": [
+                                                        "AED",
+                                                        "AFN",
+                                                        "ALL",
+                                                        "AMD",
+                                                        "ANG",
+                                                        "AOA",
+                                                        "ARS",
+                                                        "AUD",
+                                                        "AWG",
+                                                        "AZN",
+                                                        "BAM",
+                                                        "BBD",
+                                                        "BDT",
+                                                        "BGN",
+                                                        "BHD",
+                                                        "BIF",
+                                                        "BMD",
+                                                        "BND",
+                                                        "BOB",
+                                                        "BRL",
+                                                        "BSD",
+                                                        "BTN",
+                                                        "BWP",
+                                                        "BYN",
+                                                        "BZD",
+                                                        "CAD",
+                                                        "CDF",
+                                                        "CHF",
+                                                        "CLP",
+                                                        "CNY",
+                                                        "COP",
+                                                        "CRC",
+                                                        "CUC",
+                                                        "CUP",
+                                                        "CVE",
+                                                        "CZK",
+                                                        "DJF",
+                                                        "DKK",
+                                                        "DOP",
+                                                        "DZD",
+                                                        "EGP",
+                                                        "ERN",
+                                                        "ETB",
+                                                        "EUR",
+                                                        "FJD",
+                                                        "FKP",
+                                                        "GBP",
+                                                        "GEL",
+                                                        "GGP",
+                                                        "GHS",
+                                                        "GIP",
+                                                        "GMD",
+                                                        "GNF",
+                                                        "GTQ",
+                                                        "GYD",
+                                                        "HKD",
+                                                        "HNL",
+                                                        "HRK",
+                                                        "HTG",
+                                                        "HUF",
+                                                        "IDR",
+                                                        "ILS",
+                                                        "IMP",
+                                                        "INR",
+                                                        "IQD",
+                                                        "IRR",
+                                                        "ISK",
+                                                        "JEP",
+                                                        "JMD",
+                                                        "JOD",
+                                                        "JPY",
+                                                        "KES",
+                                                        "KGS",
+                                                        "KHR",
+                                                        "KMF",
+                                                        "KPW",
+                                                        "KRW",
+                                                        "KWD",
+                                                        "KYD",
+                                                        "KZT",
+                                                        "LAK",
+                                                        "LBP",
+                                                        "LKR",
+                                                        "LRD",
+                                                        "LSL",
+                                                        "LYD",
+                                                        "MAD",
+                                                        "MDL",
+                                                        "MGA",
+                                                        "MKD",
+                                                        "MMK",
+                                                        "MNT",
+                                                        "MOP",
+                                                        "MRO",
+                                                        "MUR",
+                                                        "MVR",
+                                                        "MWK",
+                                                        "MXN",
+                                                        "MYR",
+                                                        "MZN",
+                                                        "NAD",
+                                                        "NGN",
+                                                        "NIO",
+                                                        "NOK",
+                                                        "NPR",
+                                                        "NZD",
+                                                        "OMR",
+                                                        "PAB",
+                                                        "PEN",
+                                                        "PGK",
+                                                        "PHP",
+                                                        "PKR",
+                                                        "PLN",
+                                                        "PYG",
+                                                        "QAR",
+                                                        "RON",
+                                                        "RSD",
+                                                        "RUB",
+                                                        "RWF",
+                                                        "SAR",
+                                                        "SBD",
+                                                        "SCR",
+                                                        "SDG",
+                                                        "SEK",
+                                                        "SGD",
+                                                        "SHP",
+                                                        "SLL",
+                                                        "SOS",
+                                                        "SPL",
+                                                        "SRD",
+                                                        "STD",
+                                                        "SVC",
+                                                        "SYP",
+                                                        "SZL",
+                                                        "THB",
+                                                        "TJS",
+                                                        "TMT",
+                                                        "TND",
+                                                        "TOP",
+                                                        "TRY",
+                                                        "TTD",
+                                                        "TVD",
+                                                        "TWD",
+                                                        "TZS",
+                                                        "UAH",
+                                                        "UGX",
+                                                        "USD",
+                                                        "UYU",
+                                                        "UZS",
+                                                        "VEF",
+                                                        "VND",
+                                                        "VUV",
+                                                        "WST",
+                                                        "XAF",
+                                                        "XCD",
+                                                        "XDR",
+                                                        "XOF",
+                                                        "XPF",
+                                                        "XTS",
+                                                        "XXX",
+                                                        "YER",
+                                                        "ZAR",
+                                                        "ZMW",
+                                                        "ZWD"
+                                                      ]
+                                                    },
+                                                    {
+                                                      "description": "Currency\nIdentification of the currency in which the account is held.\n"
+                                                    }
+                                                  ]
+                                                }
+                                              },
+                                              "required": [
+                                                "ActiveOrHistoricCurrencyAndAmount",
+                                                "Ccy"
+                                              ],
+                                              "example": {
+                                                "ActiveOrHistoricCurrencyAndAmount": 123.45,
+                                                "Ccy": "USD"
+                                              }
+                                            },
+                                            {
+                                              "description": "TotalAmount\n\nTotal amount that is the result of the calculation of the tax for the record.\n"
+                                            }
+                                          ]
+                                        },
+                                        "Dtls": {
+                                          "description": "Details\n\nSet of elements used to provide details on the tax period and amount.\n",
+                                          "anyOf": [
+                                            {
+                                              "title": "TaxRecordDetails3",
+                                              "description": "Details on the tax period and amount.\n",
+                                              "type": "object",
+                                              "properties": {
+                                                "Prd": {
+                                                  "allOf": [
+                                                    {
+                                                      "title": "TaxPeriod3",
+                                                      "description": "Period of time details related to the tax payment.\n",
+                                                      "type": "object",
+                                                      "properties": {
+                                                        "FrToDt": {
+                                                          "allOf": [
+                                                            {
+                                                              "title": "DatePeriod2",
+                                                              "description": "Range of time defined by a start date and an end date.\n",
+                                                              "type": "object",
+                                                              "properties": {
+                                                                "FrDt": {
+                                                                  "allOf": [
+                                                                    {
+                                                                      "title": "ISODate",
+                                                                      "description": "A particular point in the progression of time in a calendar year expressed in the YYYY-MM-DD format. This representation is defined in \"XML Schema Part 2: Datatypes Second Edition - W3C Recommendation 28 October 2004\" which is aligned with ISO 8601.\n",
+                                                                      "type": "string",
+                                                                      "format": "date",
+                                                                      "example": "2013-03-07"
+                                                                    },
+                                                                    {
+                                                                      "description": "FromDate\nStart date of the range.\n"
+                                                                    }
+                                                                  ]
+                                                                },
+                                                                "ToDt": {
+                                                                  "allOf": [
+                                                                    {
+                                                                      "title": "ISODate",
+                                                                      "description": "A particular point in the progression of time in a calendar year expressed in the YYYY-MM-DD format. This representation is defined in \"XML Schema Part 2: Datatypes Second Edition - W3C Recommendation 28 October 2004\" which is aligned with ISO 8601.\n",
+                                                                      "type": "string",
+                                                                      "format": "date",
+                                                                      "example": "2013-03-07"
+                                                                    },
+                                                                    {
+                                                                      "description": "ToDate\nEnd date of the range.\n"
+                                                                    }
+                                                                  ]
+                                                                }
+                                                              },
+                                                              "required": [
+                                                                "FrDt",
+                                                                "ToDt"
+                                                              ],
+                                                              "example": {
+                                                                "FrDt": "2022-01-01",
+                                                                "ToDt": "2022-12-31"
+                                                              }
+                                                            },
+                                                            {
+                                                              "description": "FromToDate\n\nRange of time between a start date and an end date for which the tax report is provided.\n"
+                                                            }
+                                                          ]
+                                                        },
+                                                        "Tp": {
+                                                          "allOf": [
+                                                            {
+                                                              "title": "TaxRecordPeriod1Code",
+                                                              "description": "Specifies the period related to the tax payment\n\nMM01 FirstMonth Tax is related to the second month of the period.\nMM02 SecondMonth Tax is related to the first month of the period.\nMM03 ThirdMonth Tax is related to the third month of the period.\nMM04 FourthMonth Tax is related to the fourth month of the period.\nMM05 FifthMonth Tax is related to the fifth month of the period.\nMM06 SixthMonth Tax is related to the sixth month of the period.\nMM07 SeventhMonth Tax is related to the seventh month of the period.\nMM08 EighthMonth Tax is related to the eighth month of the period.\nMM09 NinthMonth Tax is related to the ninth month of the period.\nMM10 TenthMonth Tax is related to the tenth month of the period.\nMM11 EleventhMonth Tax is related to the eleventh month of the period.\nMM12 TwelfthMonth Tax is related to the twelfth month of the period.\nQTR1 FirstQuarter Tax is related to the first quarter of the period.\nQTR2 SecondQuarter Tax is related to the second quarter of the period.\nQTR3 ThirdQuarter Tax is related to the third quarter of the period.\nQTR4 FourthQuarter Tax is related to the forth quarter of the period.\nHLF1 FirstHalf Tax is related to the first half of the period.\nHLF2 SecondHalf Tax is related to the second half of the period.\n",
+                                                              "type": "string",
+                                                              "enum": [
+                                                                "MM01",
+                                                                "MM02",
+                                                                "MM03",
+                                                                "MM04",
+                                                                "MM05",
+                                                                "MM06",
+                                                                "MM07",
+                                                                "MM08",
+                                                                "MM09",
+                                                                "MM10",
+                                                                "MM11",
+                                                                "MM12",
+                                                                "QTR1",
+                                                                "QTR2",
+                                                                "QTR3",
+                                                                "QTR4",
+                                                                "HLF1",
+                                                                "HLF2"
+                                                              ],
+                                                              "example": "HLF1"
+                                                            },
+                                                            {
+                                                              "description": "Type\n\nIdentification of the period related to the tax payment.\n"
+                                                            }
+                                                          ]
+                                                        },
+                                                        "Yr": {
+                                                          "allOf": [
+                                                            {
+                                                              "title": "ISOYear",
+                                                              "description": "Year represented by YYYY (ISO 8601).\n",
+                                                              "type": "string",
+                                                              "pattern": "^\\d{4}(Z|([+-]\\d{2}:\\d{2})){0,1}$",
+                                                              "example": 2019
+                                                            },
+                                                            {
+                                                              "description": "Year\n\nYear related to the tax payment.\n"
+                                                            }
+                                                          ]
+                                                        }
+                                                      },
+                                                      "example": {
+                                                        "Yr": 2020,
+                                                        "Tp": "MM01",
+                                                        "FrToDt": {
+                                                          "FrDt": "2020-01-01",
+                                                          "ToDt": "2020-01-31"
+                                                        }
+                                                      }
+                                                    },
+                                                    {
+                                                      "description": "Period\n\nSet of elements used to provide details on the period of time related to the tax payment.\n"
+                                                    }
+                                                  ]
+                                                },
+                                                "Amt": {
+                                                  "allOf": [
+                                                    {
+                                                      "title": "ActiveOrHistoricCurrencyAndAmount",
+                                                      "type": "object",
+                                                      "description": "A number of monetary units specified in an active or a historic currency where the unit of currency is explicit and compliant with ISO 4217.\n",
+                                                      "properties": {
+                                                        "ActiveOrHistoricCurrencyAndAmount": {
+                                                          "allOf": [
+                                                            {
+                                                              "title": "ActiveOrHistoricCurrencyAndAmount_SimpleType",
+                                                              "type": "string",
+                                                              "example": 123.45,
+                                                              "pattern": "^(?!0\\d)(\\d{1,18}|\\d{1,17}.\\d{1}|\\d{1,16}.\\d{1,2}|\\d{1,15}.\\d{1,3}|\\d{1,14}.\\d{1,4}|\\d{1,13}.\\d{1,5})$"
+                                                            },
+                                                            {
+                                                              "description": "Amount of money to be moved between the debtor and creditor, before deduction of charges, expressed in the currency as ordered by the initiating party.\n"
+                                                            }
+                                                          ]
+                                                        },
+                                                        "Ccy": {
+                                                          "allOf": [
+                                                            {
+                                                              "title": "ActiveOrHistoricCurrencyCode",
+                                                              "type": "string",
+                                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                              "example": "USD",
+                                                              "minLength": 3,
+                                                              "maxLength": 3,
                                                               "enum": [
-                                                                "MM01",
-                                                                "MM02",
-                                                                "MM03",
-                                                                "MM04",
-                                                                "MM05",
-                                                                "MM06",
-                                                                "MM07",
-                                                                "MM08",
-                                                                "MM09",
-                                                                "MM10",
-                                                                "MM11",
-                                                                "MM12",
-                                                                "QTR1",
-                                                                "QTR2",
-                                                                "QTR3",
-                                                                "QTR4",
-                                                                "HLF1",
-                                                                "HLF2"
-                                                              ],
-                                                              "example": "HLF1"
-                                                            },
-                                                            {
-                                                              "description": "Type\n\nIdentification of the period related to the tax payment.\n"
-                                                            }
-                                                          ]
-                                                        },
-                                                        "Yr": {
-                                                          "allOf": [
-                                                            {
-                                                              "title": "ISOYear",
-                                                              "description": "Year represented by YYYY (ISO 8601).\n",
-                                                              "type": "string",
-                                                              "pattern": "^\\d{4}(Z|([+-]\\d{2}:\\d{2})){0,1}$",
-                                                              "example": 2019
-                                                            },
-                                                            {
-                                                              "description": "Year\n\nYear related to the tax payment.\n"
-                                                            }
-                                                          ]
-                                                        }
-                                                      },
-                                                      "example": {
-                                                        "Yr": 2020,
-                                                        "Tp": "MM01",
-                                                        "FrToDt": {
-                                                          "FrDt": "2020-01-01",
-                                                          "ToDt": "2020-01-31"
-                                                        }
-                                                      }
-                                                    },
-                                                    {
-                                                      "description": "Period\n\nSet of elements used to provide details on the period of time related to the tax payment.\n"
-                                                    }
-                                                  ]
-                                                },
-                                                "Amt": {
-                                                  "allOf": [
-                                                    {
-                                                      "title": "ActiveOrHistoricCurrencyAndAmount",
-                                                      "type": "object",
-                                                      "description": "A number of monetary units specified in an active or a historic currency where the unit of currency is explicit and compliant with ISO 4217.\n",
-                                                      "properties": {
-                                                        "ActiveOrHistoricCurrencyAndAmount": {
-                                                          "allOf": [
-                                                            {
-                                                              "title": "ActiveOrHistoricCurrencyAndAmount_SimpleType",
-                                                              "type": "string",
-                                                              "example": 123.45,
-                                                              "pattern": "^(?!0\\d)(\\d{1,18}|\\d{1,17}.\\d{1}|\\d{1,16}.\\d{1,2}|\\d{1,15}.\\d{1,3}|\\d{1,14}.\\d{1,4}|\\d{1,13}.\\d{1,5})$"
-                                                            },
-                                                            {
-                                                              "description": "Amount of money to be moved between the debtor and creditor, before deduction of charges, expressed in the currency as ordered by the initiating party.\n"
-                                                            }
-                                                          ]
-                                                        },
-                                                        "Ccy": {
-                                                          "allOf": [
-                                                            {
-                                                              "title": "ActiveOrHistoricCurrencyCode",
-                                                              "type": "string",
-                                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                              "pattern": "^[A-Z]{3,3}$",
-                                                              "example": "USD"
+                                                                "AED",
+                                                                "AFN",
+                                                                "ALL",
+                                                                "AMD",
+                                                                "ANG",
+                                                                "AOA",
+                                                                "ARS",
+                                                                "AUD",
+                                                                "AWG",
+                                                                "AZN",
+                                                                "BAM",
+                                                                "BBD",
+                                                                "BDT",
+                                                                "BGN",
+                                                                "BHD",
+                                                                "BIF",
+                                                                "BMD",
+                                                                "BND",
+                                                                "BOB",
+                                                                "BRL",
+                                                                "BSD",
+                                                                "BTN",
+                                                                "BWP",
+                                                                "BYN",
+                                                                "BZD",
+                                                                "CAD",
+                                                                "CDF",
+                                                                "CHF",
+                                                                "CLP",
+                                                                "CNY",
+                                                                "COP",
+                                                                "CRC",
+                                                                "CUC",
+                                                                "CUP",
+                                                                "CVE",
+                                                                "CZK",
+                                                                "DJF",
+                                                                "DKK",
+                                                                "DOP",
+                                                                "DZD",
+                                                                "EGP",
+                                                                "ERN",
+                                                                "ETB",
+                                                                "EUR",
+                                                                "FJD",
+                                                                "FKP",
+                                                                "GBP",
+                                                                "GEL",
+                                                                "GGP",
+                                                                "GHS",
+                                                                "GIP",
+                                                                "GMD",
+                                                                "GNF",
+                                                                "GTQ",
+                                                                "GYD",
+                                                                "HKD",
+                                                                "HNL",
+                                                                "HRK",
+                                                                "HTG",
+                                                                "HUF",
+                                                                "IDR",
+                                                                "ILS",
+                                                                "IMP",
+                                                                "INR",
+                                                                "IQD",
+                                                                "IRR",
+                                                                "ISK",
+                                                                "JEP",
+                                                                "JMD",
+                                                                "JOD",
+                                                                "JPY",
+                                                                "KES",
+                                                                "KGS",
+                                                                "KHR",
+                                                                "KMF",
+                                                                "KPW",
+                                                                "KRW",
+                                                                "KWD",
+                                                                "KYD",
+                                                                "KZT",
+                                                                "LAK",
+                                                                "LBP",
+                                                                "LKR",
+                                                                "LRD",
+                                                                "LSL",
+                                                                "LYD",
+                                                                "MAD",
+                                                                "MDL",
+                                                                "MGA",
+                                                                "MKD",
+                                                                "MMK",
+                                                                "MNT",
+                                                                "MOP",
+                                                                "MRO",
+                                                                "MUR",
+                                                                "MVR",
+                                                                "MWK",
+                                                                "MXN",
+                                                                "MYR",
+                                                                "MZN",
+                                                                "NAD",
+                                                                "NGN",
+                                                                "NIO",
+                                                                "NOK",
+                                                                "NPR",
+                                                                "NZD",
+                                                                "OMR",
+                                                                "PAB",
+                                                                "PEN",
+                                                                "PGK",
+                                                                "PHP",
+                                                                "PKR",
+                                                                "PLN",
+                                                                "PYG",
+                                                                "QAR",
+                                                                "RON",
+                                                                "RSD",
+                                                                "RUB",
+                                                                "RWF",
+                                                                "SAR",
+                                                                "SBD",
+                                                                "SCR",
+                                                                "SDG",
+                                                                "SEK",
+                                                                "SGD",
+                                                                "SHP",
+                                                                "SLL",
+                                                                "SOS",
+                                                                "SPL",
+                                                                "SRD",
+                                                                "STD",
+                                                                "SVC",
+                                                                "SYP",
+                                                                "SZL",
+                                                                "THB",
+                                                                "TJS",
+                                                                "TMT",
+                                                                "TND",
+                                                                "TOP",
+                                                                "TRY",
+                                                                "TTD",
+                                                                "TVD",
+                                                                "TWD",
+                                                                "TZS",
+                                                                "UAH",
+                                                                "UGX",
+                                                                "USD",
+                                                                "UYU",
+                                                                "UZS",
+                                                                "VEF",
+                                                                "VND",
+                                                                "VUV",
+                                                                "WST",
+                                                                "XAF",
+                                                                "XCD",
+                                                                "XDR",
+                                                                "XOF",
+                                                                "XPF",
+                                                                "XTS",
+                                                                "XXX",
+                                                                "YER",
+                                                                "ZAR",
+                                                                "ZMW",
+                                                                "ZWD"
+                                                              ]
                                                             },
                                                             {
                                                               "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -41501,9 +58902,176 @@
                                                               {
                                                                 "title": "ActiveOrHistoricCurrencyCode",
                                                                 "type": "string",
-                                                                "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                                "pattern": "^[A-Z]{3,3}$",
-                                                                "example": "USD"
+                                                                "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                                "example": "USD",
+                                                                "minLength": 3,
+                                                                "maxLength": 3,
+                                                                "enum": [
+                                                                  "AED",
+                                                                  "AFN",
+                                                                  "ALL",
+                                                                  "AMD",
+                                                                  "ANG",
+                                                                  "AOA",
+                                                                  "ARS",
+                                                                  "AUD",
+                                                                  "AWG",
+                                                                  "AZN",
+                                                                  "BAM",
+                                                                  "BBD",
+                                                                  "BDT",
+                                                                  "BGN",
+                                                                  "BHD",
+                                                                  "BIF",
+                                                                  "BMD",
+                                                                  "BND",
+                                                                  "BOB",
+                                                                  "BRL",
+                                                                  "BSD",
+                                                                  "BTN",
+                                                                  "BWP",
+                                                                  "BYN",
+                                                                  "BZD",
+                                                                  "CAD",
+                                                                  "CDF",
+                                                                  "CHF",
+                                                                  "CLP",
+                                                                  "CNY",
+                                                                  "COP",
+                                                                  "CRC",
+                                                                  "CUC",
+                                                                  "CUP",
+                                                                  "CVE",
+                                                                  "CZK",
+                                                                  "DJF",
+                                                                  "DKK",
+                                                                  "DOP",
+                                                                  "DZD",
+                                                                  "EGP",
+                                                                  "ERN",
+                                                                  "ETB",
+                                                                  "EUR",
+                                                                  "FJD",
+                                                                  "FKP",
+                                                                  "GBP",
+                                                                  "GEL",
+                                                                  "GGP",
+                                                                  "GHS",
+                                                                  "GIP",
+                                                                  "GMD",
+                                                                  "GNF",
+                                                                  "GTQ",
+                                                                  "GYD",
+                                                                  "HKD",
+                                                                  "HNL",
+                                                                  "HRK",
+                                                                  "HTG",
+                                                                  "HUF",
+                                                                  "IDR",
+                                                                  "ILS",
+                                                                  "IMP",
+                                                                  "INR",
+                                                                  "IQD",
+                                                                  "IRR",
+                                                                  "ISK",
+                                                                  "JEP",
+                                                                  "JMD",
+                                                                  "JOD",
+                                                                  "JPY",
+                                                                  "KES",
+                                                                  "KGS",
+                                                                  "KHR",
+                                                                  "KMF",
+                                                                  "KPW",
+                                                                  "KRW",
+                                                                  "KWD",
+                                                                  "KYD",
+                                                                  "KZT",
+                                                                  "LAK",
+                                                                  "LBP",
+                                                                  "LKR",
+                                                                  "LRD",
+                                                                  "LSL",
+                                                                  "LYD",
+                                                                  "MAD",
+                                                                  "MDL",
+                                                                  "MGA",
+                                                                  "MKD",
+                                                                  "MMK",
+                                                                  "MNT",
+                                                                  "MOP",
+                                                                  "MRO",
+                                                                  "MUR",
+                                                                  "MVR",
+                                                                  "MWK",
+                                                                  "MXN",
+                                                                  "MYR",
+                                                                  "MZN",
+                                                                  "NAD",
+                                                                  "NGN",
+                                                                  "NIO",
+                                                                  "NOK",
+                                                                  "NPR",
+                                                                  "NZD",
+                                                                  "OMR",
+                                                                  "PAB",
+                                                                  "PEN",
+                                                                  "PGK",
+                                                                  "PHP",
+                                                                  "PKR",
+                                                                  "PLN",
+                                                                  "PYG",
+                                                                  "QAR",
+                                                                  "RON",
+                                                                  "RSD",
+                                                                  "RUB",
+                                                                  "RWF",
+                                                                  "SAR",
+                                                                  "SBD",
+                                                                  "SCR",
+                                                                  "SDG",
+                                                                  "SEK",
+                                                                  "SGD",
+                                                                  "SHP",
+                                                                  "SLL",
+                                                                  "SOS",
+                                                                  "SPL",
+                                                                  "SRD",
+                                                                  "STD",
+                                                                  "SVC",
+                                                                  "SYP",
+                                                                  "SZL",
+                                                                  "THB",
+                                                                  "TJS",
+                                                                  "TMT",
+                                                                  "TND",
+                                                                  "TOP",
+                                                                  "TRY",
+                                                                  "TTD",
+                                                                  "TVD",
+                                                                  "TWD",
+                                                                  "TZS",
+                                                                  "UAH",
+                                                                  "UGX",
+                                                                  "USD",
+                                                                  "UYU",
+                                                                  "UZS",
+                                                                  "VEF",
+                                                                  "VND",
+                                                                  "VUV",
+                                                                  "WST",
+                                                                  "XAF",
+                                                                  "XCD",
+                                                                  "XDR",
+                                                                  "XOF",
+                                                                  "XPF",
+                                                                  "XTS",
+                                                                  "XXX",
+                                                                  "YER",
+                                                                  "ZAR",
+                                                                  "ZMW",
+                                                                  "ZWD"
+                                                                ]
                                                               },
                                                               {
                                                                 "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -41700,9 +59268,10 @@
                         "allOf": [
                           {
                             "title": "Exact32HexBinaryText",
-                            "description": "Specifies a hexadecimal string with a length of 32 characters.\n",
+                            "description": "Specifies a hexadecimal string.\n\nNOTE: This pattern is not the original ISO20022 specification.\n",
                             "type": "string",
-                            "example": "1234567890ABCDEF1234567890ABCDEF"
+                            "pattern": "^[A-Za-z0-9-_]{43}$",
+                            "maxLength": 48
                           },
                           {
                             "description": "SHA-256 signature of the terms\n"
@@ -42048,11 +59617,17 @@
   },
   "ExternalPaymentTransactionStatus1Code": {
     "title": "ExternalPaymentTransactionStatus1Code",
-    "description": "Specifies the external payment transaction status code.\n\nFor FSPIOP transfer state enumeration mappings:\n{\n  \"COMM\": \"COMMITED\",\n  \"RESV\": \"RESERVED\",\n  \"RECV\": \"RECEIVED\",\n  \"ABOR\": \"ABORTED\"\n}\n",
+    "description": "Specifies the external payment transaction status code.\n\nFor FSPIOP transfer state enumeration mappings:\n{\n  \"COMM\": \"COMMITED\",\n  \"RESV\": \"RESERVED\",\n  \"RECV\": \"RECEIVED\",\n  \"ABOR\": \"ABORTED\"\n}\n\nNOTE: enum enforcement is not apart of the ISO20022 specification, but is added here for FSPIOP mappings.\n",
     "type": "string",
     "minLength": 1,
     "maxLength": 4,
-    "example": "COMM"
+    "example": "COMM",
+    "enum": [
+      "COMM",
+      "RESV",
+      "RECV",
+      "ABOR"
+    ]
   },
   "ExternalPersonIdentification1Code": {
     "title": "ExternalPersonIdentification1Code",
@@ -43345,9 +60920,176 @@
                           {
                             "title": "ActiveCurrencyCode",
                             "type": "string",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -43957,45 +61699,39 @@
                       "InstrId": {
                         "allOf": [
                           {
-                            "title": "Max35Text",
-                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "title": "ULIDIdentifier",
                             "type": "string",
-                            "minLength": 1,
-                            "maxLength": 35,
-                            "example": 1.234567890123457e+34
+                            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                            "example": "01AN4Z07BY79KA1307SR9X4MV3"
                           },
                           {
-                            "description": "InstructionIdentification (FSPIOP equivalent: transactionRequestId)\n\nDefinition: Unique identification, as assigned by an instructing party for an instructed party, to\nunambiguously identify the instruction.\n\nUsage: The instruction identification is a point to point reference that can be used between the\ninstructing party and the instructed party to refer to the individual instruction. It can be included in\nseveral messages related to the instruction.\n"
+                            "description": "InstructionIdentification (FSPIOP equivalent: transactionRequestId)\n\nDefinition: Unique identification, as assigned by an instructing party for an instructed party, to\nunambiguously identify the instruction.\n\nUsage: The instruction identification is a point to point reference that can be used between the\ninstructing party and the instructed party to refer to the individual instruction. It can be included in\nseveral messages related to the instruction.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                           }
                         ]
                       },
                       "EndToEndId": {
                         "allOf": [
                           {
-                            "title": "Max35Text",
-                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "title": "ULIDIdentifier",
                             "type": "string",
-                            "minLength": 1,
-                            "maxLength": 35,
-                            "example": 1.234567890123457e+34
+                            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                            "example": "01AN4Z07BY79KA1307SR9X4MV3"
                           },
                           {
-                            "description": "EndToEndIdentification (FSPIOP equivalent: transactionId)\n\nDefinition: Unique identification, as assigned by the initiating party, to unambiguously identify the\ntransaction. This identification is passed on, unchanged, throughout the entire end-to-end chain.\n\nUsage: The end-to-end identification can be used for reconciliation or to link tasks relating to the\ntransaction. It can be included in several messages related to the transaction.\n\nUsage: In case there are technical limitations to pass on multiple references, the end-to-end\nidentification must be passed on throughout the entire end-to-end chain.\n"
+                            "description": "EndToEndIdentification (FSPIOP equivalent: transactionId)\n\nDefinition: Unique identification, as assigned by the initiating party, to unambiguously identify the\ntransaction. This identification is passed on, unchanged, throughout the entire end-to-end chain.\n\nUsage: The end-to-end identification can be used for reconciliation or to link tasks relating to the\ntransaction. It can be included in several messages related to the transaction.\n\nUsage: In case there are technical limitations to pass on multiple references, the end-to-end\nidentification must be passed on throughout the entire end-to-end chain.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                           }
                         ]
                       },
                       "TxId": {
                         "allOf": [
                           {
-                            "title": "Max35Text",
-                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "title": "ULIDIdentifier",
                             "type": "string",
-                            "minLength": 1,
-                            "maxLength": 35,
-                            "example": 1.234567890123457e+34
+                            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                            "example": "01AN4Z07BY79KA1307SR9X4MV3"
                           },
                           {
-                            "description": "TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)\n\nDefinition: Unique identification, as assigned by the first instructing agent, to unambiguously identify the\ntransaction that is passed on, unchanged, throughout the entire interbank chain.\n\nUsage: The transaction identification can be used for reconciliation, tracking or to link tasks relating to\nthe transaction on the interbank level.\n\nUsage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.\n"
+                            "description": "TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)\n\nDefinition: Unique identification, as assigned by the first instructing agent, to unambiguously identify the\ntransaction that is passed on, unchanged, throughout the entire interbank chain.\n\nUsage: The transaction identification can be used for reconciliation, tracking or to link tasks relating to\nthe transaction on the interbank level.\n\nUsage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                           }
                         ]
                       },
@@ -44306,9 +62042,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -48361,9 +66264,176 @@
                           {
                             "title": "ActiveCurrencyCode",
                             "type": "string",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -49569,9 +67639,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -52798,9 +71035,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -53083,9 +71487,10 @@
                             "allOf": [
                               {
                                 "title": "Exact32HexBinaryText",
-                                "description": "Specifies a hexadecimal string with a length of 32 characters.\n",
+                                "description": "Specifies a hexadecimal string.\n\nNOTE: This pattern is not the original ISO20022 specification.\n",
                                 "type": "string",
-                                "example": "1234567890ABCDEF1234567890ABCDEF"
+                                "pattern": "^[A-Za-z0-9-_]{43}$",
+                                "maxLength": 48
                               },
                               {
                                 "description": "SHA-256 signature of the terms\n"
@@ -53366,9 +71771,176 @@
                           {
                             "title": "ActiveCurrencyCode",
                             "type": "string",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -53964,7 +72536,7 @@
       "CdtTrfTxInf": {
         "allOf": [
           {
-            "title": "CreditTransferTransaction68",
+            "title": "CreditTransferTransaction68_Put_FX_Quotes_ID",
             "description": "Provides further details specific to the individual transaction(s) included in the message.\n",
             "type": "object",
             "properties": {
@@ -53978,45 +72550,39 @@
                       "InstrId": {
                         "allOf": [
                           {
-                            "title": "Max35Text",
-                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "title": "ULIDIdentifier",
                             "type": "string",
-                            "minLength": 1,
-                            "maxLength": 35,
-                            "example": 1.234567890123457e+34
+                            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                            "example": "01AN4Z07BY79KA1307SR9X4MV3"
                           },
                           {
-                            "description": "InstructionIdentification (FSPIOP equivalent: transactionRequestId)\n\nDefinition: Unique identification, as assigned by an instructing party for an instructed party, to\nunambiguously identify the instruction.\n\nUsage: The instruction identification is a point to point reference that can be used between the\ninstructing party and the instructed party to refer to the individual instruction. It can be included in\nseveral messages related to the instruction.\n"
+                            "description": "InstructionIdentification (FSPIOP equivalent: transactionRequestId)\n\nDefinition: Unique identification, as assigned by an instructing party for an instructed party, to\nunambiguously identify the instruction.\n\nUsage: The instruction identification is a point to point reference that can be used between the\ninstructing party and the instructed party to refer to the individual instruction. It can be included in\nseveral messages related to the instruction.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                           }
                         ]
                       },
                       "EndToEndId": {
                         "allOf": [
                           {
-                            "title": "Max35Text",
-                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "title": "ULIDIdentifier",
                             "type": "string",
-                            "minLength": 1,
-                            "maxLength": 35,
-                            "example": 1.234567890123457e+34
+                            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                            "example": "01AN4Z07BY79KA1307SR9X4MV3"
                           },
                           {
-                            "description": "EndToEndIdentification (FSPIOP equivalent: transactionId)\n\nDefinition: Unique identification, as assigned by the initiating party, to unambiguously identify the\ntransaction. This identification is passed on, unchanged, throughout the entire end-to-end chain.\n\nUsage: The end-to-end identification can be used for reconciliation or to link tasks relating to the\ntransaction. It can be included in several messages related to the transaction.\n\nUsage: In case there are technical limitations to pass on multiple references, the end-to-end\nidentification must be passed on throughout the entire end-to-end chain.\n"
+                            "description": "EndToEndIdentification (FSPIOP equivalent: transactionId)\n\nDefinition: Unique identification, as assigned by the initiating party, to unambiguously identify the\ntransaction. This identification is passed on, unchanged, throughout the entire end-to-end chain.\n\nUsage: The end-to-end identification can be used for reconciliation or to link tasks relating to the\ntransaction. It can be included in several messages related to the transaction.\n\nUsage: In case there are technical limitations to pass on multiple references, the end-to-end\nidentification must be passed on throughout the entire end-to-end chain.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                           }
                         ]
                       },
                       "TxId": {
                         "allOf": [
                           {
-                            "title": "Max35Text",
-                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "title": "ULIDIdentifier",
                             "type": "string",
-                            "minLength": 1,
-                            "maxLength": 35,
-                            "example": 1.234567890123457e+34
+                            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                            "example": "01AN4Z07BY79KA1307SR9X4MV3"
                           },
                           {
-                            "description": "TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)\n\nDefinition: Unique identification, as assigned by the first instructing agent, to unambiguously identify the\ntransaction that is passed on, unchanged, throughout the entire interbank chain.\n\nUsage: The transaction identification can be used for reconciliation, tracking or to link tasks relating to\nthe transaction on the interbank level.\n\nUsage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.\n"
+                            "description": "TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)\n\nDefinition: Unique identification, as assigned by the first instructing agent, to unambiguously identify the\ntransaction that is passed on, unchanged, throughout the entire interbank chain.\n\nUsage: The transaction identification can be used for reconciliation, tracking or to link tasks relating to\nthe transaction on the interbank level.\n\nUsage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                           }
                         ]
                       },
@@ -54327,9 +72893,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -58382,9 +77115,176 @@
                           {
                             "title": "ActiveCurrencyCode",
                             "type": "string",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -59590,9 +78490,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -62819,9 +81886,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -62965,7 +82199,7 @@
               "InstrForCdtrAgt": {
                 "allOf": [
                   {
-                    "title": "InstructionForCreditorAgent3",
+                    "title": "InstructionForCreditorAgent3_Put_FX_Quotes_ID",
                     "description": "Further information related to the processing of the payment instruction, provided by the initiating party, and intended for the creditor agent.\n",
                     "type": "object",
                     "properties": {
@@ -62987,12 +82221,14 @@
                       "InstrInf": {
                         "allOf": [
                           {
-                            "title": "Max140Text",
-                            "description": "Specifies a character string with a maximum length of 140 characters.\n",
+                            "title": "AmountTypeEnum",
+                            "description": "NOTE: This pattern is not the original ISO20022 specification.\n      This represents the enum values when mapping to and from FSPIOP specification.\n",
                             "type": "string",
-                            "minLength": 1,
-                            "maxLength": 140,
-                            "example": 12345
+                            "enum": [
+                              "SEND",
+                              "RECEIVE"
+                            ],
+                            "example": "SEND"
                           },
                           {
                             "description": "InstructionInformation\nFurther information complementing the coded instruction or instruction to the creditor's agent that is bilaterally agreed or specific to a user community.\n"
@@ -63104,9 +82340,10 @@
                             "allOf": [
                               {
                                 "title": "Exact32HexBinaryText",
-                                "description": "Specifies a hexadecimal string with a length of 32 characters.\n",
+                                "description": "Specifies a hexadecimal string.\n\nNOTE: This pattern is not the original ISO20022 specification.\n",
                                 "type": "string",
-                                "example": "1234567890ABCDEF1234567890ABCDEF"
+                                "pattern": "^[A-Za-z0-9-_]{43}$",
+                                "maxLength": 48
                               },
                               {
                                 "description": "SHA-256 signature of the terms\n"
@@ -63189,7 +82426,7 @@
             }
           },
           {
-            "description": "CreditTransferTransactionInformation\nSet of elements providing information specific to the individual credit transfer(s).\n"
+            "description": "CreditTransferTransaction68_Put_FX_Quotes_ID\nSet of elements providing information specific to the individual credit transfer(s).\n"
           }
         ]
       }
@@ -63715,45 +82952,39 @@
                       "InstrId": {
                         "allOf": [
                           {
-                            "title": "Max35Text",
-                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "title": "ULIDIdentifier",
                             "type": "string",
-                            "minLength": 1,
-                            "maxLength": 35,
-                            "example": 1.234567890123457e+34
+                            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                            "example": "01AN4Z07BY79KA1307SR9X4MV3"
                           },
                           {
-                            "description": "InstructionIdentification (FSPIOP equivalent: transactionRequestId)\n\nDefinition: Unique identification, as assigned by an instructing party for an instructed party, to\nunambiguously identify the instruction.\n\nUsage: The instruction identification is a point to point reference that can be used between the\ninstructing party and the instructed party to refer to the individual instruction. It can be included in\nseveral messages related to the instruction.\n"
+                            "description": "InstructionIdentification (FSPIOP equivalent: transactionRequestId)\n\nDefinition: Unique identification, as assigned by an instructing party for an instructed party, to\nunambiguously identify the instruction.\n\nUsage: The instruction identification is a point to point reference that can be used between the\ninstructing party and the instructed party to refer to the individual instruction. It can be included in\nseveral messages related to the instruction.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                           }
                         ]
                       },
                       "EndToEndId": {
                         "allOf": [
                           {
-                            "title": "Max35Text",
-                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "title": "ULIDIdentifier",
                             "type": "string",
-                            "minLength": 1,
-                            "maxLength": 35,
-                            "example": 1.234567890123457e+34
+                            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                            "example": "01AN4Z07BY79KA1307SR9X4MV3"
                           },
                           {
-                            "description": "EndToEndIdentification (FSPIOP equivalent: transactionId)\n\nDefinition: Unique identification, as assigned by the initiating party, to unambiguously identify the\ntransaction. This identification is passed on, unchanged, throughout the entire end-to-end chain.\n\nUsage: The end-to-end identification can be used for reconciliation or to link tasks relating to the\ntransaction. It can be included in several messages related to the transaction.\n\nUsage: In case there are technical limitations to pass on multiple references, the end-to-end\nidentification must be passed on throughout the entire end-to-end chain.\n"
+                            "description": "EndToEndIdentification (FSPIOP equivalent: transactionId)\n\nDefinition: Unique identification, as assigned by the initiating party, to unambiguously identify the\ntransaction. This identification is passed on, unchanged, throughout the entire end-to-end chain.\n\nUsage: The end-to-end identification can be used for reconciliation or to link tasks relating to the\ntransaction. It can be included in several messages related to the transaction.\n\nUsage: In case there are technical limitations to pass on multiple references, the end-to-end\nidentification must be passed on throughout the entire end-to-end chain.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                           }
                         ]
                       },
                       "TxId": {
                         "allOf": [
                           {
-                            "title": "Max35Text",
-                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "title": "ULIDIdentifier",
                             "type": "string",
-                            "minLength": 1,
-                            "maxLength": 35,
-                            "example": 1.234567890123457e+34
+                            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                            "example": "01AN4Z07BY79KA1307SR9X4MV3"
                           },
                           {
-                            "description": "TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)\n\nDefinition: Unique identification, as assigned by the first instructing agent, to unambiguously identify the\ntransaction that is passed on, unchanged, throughout the entire interbank chain.\n\nUsage: The transaction identification can be used for reconciliation, tracking or to link tasks relating to\nthe transaction on the interbank level.\n\nUsage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.\n"
+                            "description": "TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)\n\nDefinition: Unique identification, as assigned by the first instructing agent, to unambiguously identify the\ntransaction that is passed on, unchanged, throughout the entire interbank chain.\n\nUsage: The transaction identification can be used for reconciliation, tracking or to link tasks relating to\nthe transaction on the interbank level.\n\nUsage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                           }
                         ]
                       },
@@ -64064,9 +83295,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -68119,9 +87517,176 @@
                           {
                             "title": "ActiveCurrencyCode",
                             "type": "string",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -69327,9 +88892,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -72556,9 +92288,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -72841,9 +92740,10 @@
                             "allOf": [
                               {
                                 "title": "Exact32HexBinaryText",
-                                "description": "Specifies a hexadecimal string with a length of 32 characters.\n",
+                                "description": "Specifies a hexadecimal string.\n\nNOTE: This pattern is not the original ISO20022 specification.\n",
                                 "type": "string",
-                                "example": "1234567890ABCDEF1234567890ABCDEF"
+                                "pattern": "^[A-Za-z0-9-_]{43}$",
+                                "maxLength": 48
                               },
                               {
                                 "description": "SHA-256 signature of the terms\n"
@@ -79226,9 +99126,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -81597,9 +101664,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -88362,9 +108596,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -90733,9 +111134,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -92103,9 +112671,176 @@
                   {
                     "title": "ActiveCurrencyCode",
                     "type": "string",
-                    "pattern": "^[A-Z]{3,3}$",
-                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".",
-                    "example": "USD"
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
                   },
                   {
                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -98510,9 +119245,176 @@
                   {
                     "title": "ActiveOrHistoricCurrencyCode",
                     "type": "string",
-                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                    "pattern": "^[A-Z]{3,3}$",
-                    "example": "USD"
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
                   },
                   {
                     "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -99674,6 +120576,49 @@
       "InstrInf": "Please advise/contact next agent by phone."
     }
   },
+  "InstructionForCreditorAgent3_Put_FX_Quotes_ID": {
+    "title": "InstructionForCreditorAgent3_Put_FX_Quotes_ID",
+    "description": "Further information related to the processing of the payment instruction, provided by the initiating party, and intended for the creditor agent.\n",
+    "type": "object",
+    "properties": {
+      "Cd": {
+        "allOf": [
+          {
+            "title": "ExternalCreditorAgentInstruction1Code",
+            "description": "Specifies the instruction given by the creditor to the creditor agent.",
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 4,
+            "example": 1234
+          },
+          {
+            "description": "Code\nCoded information related to the processing of the payment instruction, provided by the initiating party, and intended for the creditor's agent.\n"
+          }
+        ]
+      },
+      "InstrInf": {
+        "allOf": [
+          {
+            "title": "AmountTypeEnum",
+            "description": "NOTE: This pattern is not the original ISO20022 specification.\n      This represents the enum values when mapping to and from FSPIOP specification.\n",
+            "type": "string",
+            "enum": [
+              "SEND",
+              "RECEIVE"
+            ],
+            "example": "SEND"
+          },
+          {
+            "description": "InstructionInformation\nFurther information complementing the coded instruction or instruction to the creditor's agent that is bilaterally agreed or specific to a user community.\n"
+          }
+        ]
+      }
+    },
+    "example": {
+      "Cd": "PHOA",
+      "InstrInf": "Please advise/contact next agent by phone."
+    }
+  },
   "InstructionForNextAgent1": {
     "title": "InstructionForNextAgent1",
     "description": "Further information related to the processing of the payment instruction, provided by the initiating party, and intended for the next agent in the payment chain.\n",
@@ -100453,11 +121398,17 @@
                 "allOf": [
                   {
                     "title": "ExternalPaymentTransactionStatus1Code",
-                    "description": "Specifies the external payment transaction status code.\n\nFor FSPIOP transfer state enumeration mappings:\n{\n  \"COMM\": \"COMMITED\",\n  \"RESV\": \"RESERVED\",\n  \"RECV\": \"RECEIVED\",\n  \"ABOR\": \"ABORTED\"\n}\n",
+                    "description": "Specifies the external payment transaction status code.\n\nFor FSPIOP transfer state enumeration mappings:\n{\n  \"COMM\": \"COMMITED\",\n  \"RESV\": \"RESERVED\",\n  \"RECV\": \"RECEIVED\",\n  \"ABOR\": \"ABORTED\"\n}\n\nNOTE: enum enforcement is not apart of the ISO20022 specification, but is added here for FSPIOP mappings.\n",
                     "type": "string",
                     "minLength": 1,
                     "maxLength": 4,
-                    "example": "COMM"
+                    "example": "COMM",
+                    "enum": [
+                      "COMM",
+                      "RESV",
+                      "RECV",
+                      "ABOR"
+                    ]
                   },
                   {
                     "description": "Specifies the status of the transaction.\n"
@@ -101669,9 +122620,10 @@
                 "allOf": [
                   {
                     "title": "Exact32HexBinaryText",
-                    "description": "Specifies a hexadecimal string with a length of 32 characters.\n",
+                    "description": "Specifies a hexadecimal string.\n\nNOTE: This pattern is not the original ISO20022 specification.\n",
                     "type": "string",
-                    "example": "1234567890ABCDEF1234567890ABCDEF"
+                    "pattern": "^[A-Za-z0-9-_]{43}$",
+                    "maxLength": 48
                   },
                   {
                     "description": "Unique reference, as assigned by the account servicing institution, to unambiguously identify the confirmation.\n"
@@ -102045,11 +122997,17 @@
                 "allOf": [
                   {
                     "title": "ExternalPaymentTransactionStatus1Code",
-                    "description": "Specifies the external payment transaction status code.\n\nFor FSPIOP transfer state enumeration mappings:\n{\n  \"COMM\": \"COMMITED\",\n  \"RESV\": \"RESERVED\",\n  \"RECV\": \"RECEIVED\",\n  \"ABOR\": \"ABORTED\"\n}\n",
+                    "description": "Specifies the external payment transaction status code.\n\nFor FSPIOP transfer state enumeration mappings:\n{\n  \"COMM\": \"COMMITED\",\n  \"RESV\": \"RESERVED\",\n  \"RECV\": \"RECEIVED\",\n  \"ABOR\": \"ABORTED\"\n}\n\nNOTE: enum enforcement is not apart of the ISO20022 specification, but is added here for FSPIOP mappings.\n",
                     "type": "string",
                     "minLength": 1,
                     "maxLength": 4,
-                    "example": "COMM"
+                    "example": "COMM",
+                    "enum": [
+                      "COMM",
+                      "RESV",
+                      "RECV",
+                      "ABOR"
+                    ]
                   },
                   {
                     "description": "Specifies the status of the transaction.\n"
@@ -103261,9 +124219,10 @@
                 "allOf": [
                   {
                     "title": "Exact32HexBinaryText",
-                    "description": "Specifies a hexadecimal string with a length of 32 characters.\n",
+                    "description": "Specifies a hexadecimal string.\n\nNOTE: This pattern is not the original ISO20022 specification.\n",
                     "type": "string",
-                    "example": "1234567890ABCDEF1234567890ABCDEF"
+                    "pattern": "^[A-Za-z0-9-_]{43}$",
+                    "maxLength": 48
                   },
                   {
                     "description": "Unique reference, as assigned by the account servicing institution, to unambiguously identify the confirmation.\n"
@@ -108406,45 +129365,39 @@
       "InstrId": {
         "allOf": [
           {
-            "title": "Max35Text",
-            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+            "title": "ULIDIdentifier",
             "type": "string",
-            "minLength": 1,
-            "maxLength": 35,
-            "example": 1.234567890123457e+34
+            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+            "example": "01AN4Z07BY79KA1307SR9X4MV3"
           },
           {
-            "description": "InstructionIdentification (FSPIOP equivalent: transactionRequestId)\n\nDefinition: Unique identification, as assigned by an instructing party for an instructed party, to\nunambiguously identify the instruction.\n\nUsage: The instruction identification is a point to point reference that can be used between the\ninstructing party and the instructed party to refer to the individual instruction. It can be included in\nseveral messages related to the instruction.\n"
+            "description": "InstructionIdentification (FSPIOP equivalent: transactionRequestId)\n\nDefinition: Unique identification, as assigned by an instructing party for an instructed party, to\nunambiguously identify the instruction.\n\nUsage: The instruction identification is a point to point reference that can be used between the\ninstructing party and the instructed party to refer to the individual instruction. It can be included in\nseveral messages related to the instruction.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
           }
         ]
       },
       "EndToEndId": {
         "allOf": [
           {
-            "title": "Max35Text",
-            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+            "title": "ULIDIdentifier",
             "type": "string",
-            "minLength": 1,
-            "maxLength": 35,
-            "example": 1.234567890123457e+34
+            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+            "example": "01AN4Z07BY79KA1307SR9X4MV3"
           },
           {
-            "description": "EndToEndIdentification (FSPIOP equivalent: transactionId)\n\nDefinition: Unique identification, as assigned by the initiating party, to unambiguously identify the\ntransaction. This identification is passed on, unchanged, throughout the entire end-to-end chain.\n\nUsage: The end-to-end identification can be used for reconciliation or to link tasks relating to the\ntransaction. It can be included in several messages related to the transaction.\n\nUsage: In case there are technical limitations to pass on multiple references, the end-to-end\nidentification must be passed on throughout the entire end-to-end chain.\n"
+            "description": "EndToEndIdentification (FSPIOP equivalent: transactionId)\n\nDefinition: Unique identification, as assigned by the initiating party, to unambiguously identify the\ntransaction. This identification is passed on, unchanged, throughout the entire end-to-end chain.\n\nUsage: The end-to-end identification can be used for reconciliation or to link tasks relating to the\ntransaction. It can be included in several messages related to the transaction.\n\nUsage: In case there are technical limitations to pass on multiple references, the end-to-end\nidentification must be passed on throughout the entire end-to-end chain.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
           }
         ]
       },
       "TxId": {
         "allOf": [
           {
-            "title": "Max35Text",
-            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+            "title": "ULIDIdentifier",
             "type": "string",
-            "minLength": 1,
-            "maxLength": 35,
-            "example": 1.234567890123457e+34
+            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+            "example": "01AN4Z07BY79KA1307SR9X4MV3"
           },
           {
-            "description": "TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)\n\nDefinition: Unique identification, as assigned by the first instructing agent, to unambiguously identify the\ntransaction that is passed on, unchanged, throughout the entire interbank chain.\n\nUsage: The transaction identification can be used for reconciliation, tracking or to link tasks relating to\nthe transaction on the interbank level.\n\nUsage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.\n"
+            "description": "TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)\n\nDefinition: Unique identification, as assigned by the first instructing agent, to unambiguously identify the\ntransaction that is passed on, unchanged, throughout the entire interbank chain.\n\nUsage: The transaction identification can be used for reconciliation, tracking or to link tasks relating to\nthe transaction on the interbank level.\n\nUsage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
           }
         ]
       },
@@ -108570,11 +129523,17 @@
         "allOf": [
           {
             "title": "ExternalPaymentTransactionStatus1Code",
-            "description": "Specifies the external payment transaction status code.\n\nFor FSPIOP transfer state enumeration mappings:\n{\n  \"COMM\": \"COMMITED\",\n  \"RESV\": \"RESERVED\",\n  \"RECV\": \"RECEIVED\",\n  \"ABOR\": \"ABORTED\"\n}\n",
+            "description": "Specifies the external payment transaction status code.\n\nFor FSPIOP transfer state enumeration mappings:\n{\n  \"COMM\": \"COMMITED\",\n  \"RESV\": \"RESERVED\",\n  \"RECV\": \"RECEIVED\",\n  \"ABOR\": \"ABORTED\"\n}\n\nNOTE: enum enforcement is not apart of the ISO20022 specification, but is added here for FSPIOP mappings.\n",
             "type": "string",
             "minLength": 1,
             "maxLength": 4,
-            "example": "COMM"
+            "example": "COMM",
+            "enum": [
+              "COMM",
+              "RESV",
+              "RECV",
+              "ABOR"
+            ]
           },
           {
             "description": "Specifies the status of the transaction.\n"
@@ -109786,9 +130745,10 @@
         "allOf": [
           {
             "title": "Exact32HexBinaryText",
-            "description": "Specifies a hexadecimal string with a length of 32 characters.\n",
+            "description": "Specifies a hexadecimal string.\n\nNOTE: This pattern is not the original ISO20022 specification.\n",
             "type": "string",
-            "example": "1234567890ABCDEF1234567890ABCDEF"
+            "pattern": "^[A-Za-z0-9-_]{43}$",
+            "maxLength": 48
           },
           {
             "description": "Unique reference, as assigned by the account servicing institution, to unambiguously identify the confirmation.\n"
@@ -111618,9 +132578,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -111768,9 +132895,176 @@
                             {
                               "title": "ActiveOrHistoricCurrencyCode",
                               "type": "string",
-                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                              "pattern": "^[A-Z]{3,3}$",
-                              "example": "USD"
+                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                              "example": "USD",
+                              "minLength": 3,
+                              "maxLength": 3,
+                              "enum": [
+                                "AED",
+                                "AFN",
+                                "ALL",
+                                "AMD",
+                                "ANG",
+                                "AOA",
+                                "ARS",
+                                "AUD",
+                                "AWG",
+                                "AZN",
+                                "BAM",
+                                "BBD",
+                                "BDT",
+                                "BGN",
+                                "BHD",
+                                "BIF",
+                                "BMD",
+                                "BND",
+                                "BOB",
+                                "BRL",
+                                "BSD",
+                                "BTN",
+                                "BWP",
+                                "BYN",
+                                "BZD",
+                                "CAD",
+                                "CDF",
+                                "CHF",
+                                "CLP",
+                                "CNY",
+                                "COP",
+                                "CRC",
+                                "CUC",
+                                "CUP",
+                                "CVE",
+                                "CZK",
+                                "DJF",
+                                "DKK",
+                                "DOP",
+                                "DZD",
+                                "EGP",
+                                "ERN",
+                                "ETB",
+                                "EUR",
+                                "FJD",
+                                "FKP",
+                                "GBP",
+                                "GEL",
+                                "GGP",
+                                "GHS",
+                                "GIP",
+                                "GMD",
+                                "GNF",
+                                "GTQ",
+                                "GYD",
+                                "HKD",
+                                "HNL",
+                                "HRK",
+                                "HTG",
+                                "HUF",
+                                "IDR",
+                                "ILS",
+                                "IMP",
+                                "INR",
+                                "IQD",
+                                "IRR",
+                                "ISK",
+                                "JEP",
+                                "JMD",
+                                "JOD",
+                                "JPY",
+                                "KES",
+                                "KGS",
+                                "KHR",
+                                "KMF",
+                                "KPW",
+                                "KRW",
+                                "KWD",
+                                "KYD",
+                                "KZT",
+                                "LAK",
+                                "LBP",
+                                "LKR",
+                                "LRD",
+                                "LSL",
+                                "LYD",
+                                "MAD",
+                                "MDL",
+                                "MGA",
+                                "MKD",
+                                "MMK",
+                                "MNT",
+                                "MOP",
+                                "MRO",
+                                "MUR",
+                                "MVR",
+                                "MWK",
+                                "MXN",
+                                "MYR",
+                                "MZN",
+                                "NAD",
+                                "NGN",
+                                "NIO",
+                                "NOK",
+                                "NPR",
+                                "NZD",
+                                "OMR",
+                                "PAB",
+                                "PEN",
+                                "PGK",
+                                "PHP",
+                                "PKR",
+                                "PLN",
+                                "PYG",
+                                "QAR",
+                                "RON",
+                                "RSD",
+                                "RUB",
+                                "RWF",
+                                "SAR",
+                                "SBD",
+                                "SCR",
+                                "SDG",
+                                "SEK",
+                                "SGD",
+                                "SHP",
+                                "SLL",
+                                "SOS",
+                                "SPL",
+                                "SRD",
+                                "STD",
+                                "SVC",
+                                "SYP",
+                                "SZL",
+                                "THB",
+                                "TJS",
+                                "TMT",
+                                "TND",
+                                "TOP",
+                                "TRY",
+                                "TTD",
+                                "TVD",
+                                "TWD",
+                                "TZS",
+                                "UAH",
+                                "UGX",
+                                "USD",
+                                "UYU",
+                                "UZS",
+                                "VEF",
+                                "VND",
+                                "VUV",
+                                "WST",
+                                "XAF",
+                                "XCD",
+                                "XDR",
+                                "XOF",
+                                "XPF",
+                                "XTS",
+                                "XXX",
+                                "YER",
+                                "ZAR",
+                                "ZMW",
+                                "ZWD"
+                              ]
                             },
                             {
                               "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -113502,9 +134796,176 @@
                   {
                     "title": "ActiveOrHistoricCurrencyCode",
                     "type": "string",
-                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                    "pattern": "^[A-Z]{3,3}$",
-                    "example": "USD"
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
                   },
                   {
                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -113655,9 +135116,176 @@
                   {
                     "title": "ActiveOrHistoricCurrencyCode",
                     "type": "string",
-                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                    "pattern": "^[A-Z]{3,3}$",
-                    "example": "USD"
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
                   },
                   {
                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -113704,9 +135332,176 @@
                   {
                     "title": "ActiveOrHistoricCurrencyCode",
                     "type": "string",
-                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                    "pattern": "^[A-Z]{3,3}$",
-                    "example": "USD"
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
                   },
                   {
                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -113880,9 +135675,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -114073,9 +136035,176 @@
                             {
                               "title": "ActiveOrHistoricCurrencyCode",
                               "type": "string",
-                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                              "pattern": "^[A-Z]{3,3}$",
-                              "example": "USD"
+                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                              "example": "USD",
+                              "minLength": 3,
+                              "maxLength": 3,
+                              "enum": [
+                                "AED",
+                                "AFN",
+                                "ALL",
+                                "AMD",
+                                "ANG",
+                                "AOA",
+                                "ARS",
+                                "AUD",
+                                "AWG",
+                                "AZN",
+                                "BAM",
+                                "BBD",
+                                "BDT",
+                                "BGN",
+                                "BHD",
+                                "BIF",
+                                "BMD",
+                                "BND",
+                                "BOB",
+                                "BRL",
+                                "BSD",
+                                "BTN",
+                                "BWP",
+                                "BYN",
+                                "BZD",
+                                "CAD",
+                                "CDF",
+                                "CHF",
+                                "CLP",
+                                "CNY",
+                                "COP",
+                                "CRC",
+                                "CUC",
+                                "CUP",
+                                "CVE",
+                                "CZK",
+                                "DJF",
+                                "DKK",
+                                "DOP",
+                                "DZD",
+                                "EGP",
+                                "ERN",
+                                "ETB",
+                                "EUR",
+                                "FJD",
+                                "FKP",
+                                "GBP",
+                                "GEL",
+                                "GGP",
+                                "GHS",
+                                "GIP",
+                                "GMD",
+                                "GNF",
+                                "GTQ",
+                                "GYD",
+                                "HKD",
+                                "HNL",
+                                "HRK",
+                                "HTG",
+                                "HUF",
+                                "IDR",
+                                "ILS",
+                                "IMP",
+                                "INR",
+                                "IQD",
+                                "IRR",
+                                "ISK",
+                                "JEP",
+                                "JMD",
+                                "JOD",
+                                "JPY",
+                                "KES",
+                                "KGS",
+                                "KHR",
+                                "KMF",
+                                "KPW",
+                                "KRW",
+                                "KWD",
+                                "KYD",
+                                "KZT",
+                                "LAK",
+                                "LBP",
+                                "LKR",
+                                "LRD",
+                                "LSL",
+                                "LYD",
+                                "MAD",
+                                "MDL",
+                                "MGA",
+                                "MKD",
+                                "MMK",
+                                "MNT",
+                                "MOP",
+                                "MRO",
+                                "MUR",
+                                "MVR",
+                                "MWK",
+                                "MXN",
+                                "MYR",
+                                "MZN",
+                                "NAD",
+                                "NGN",
+                                "NIO",
+                                "NOK",
+                                "NPR",
+                                "NZD",
+                                "OMR",
+                                "PAB",
+                                "PEN",
+                                "PGK",
+                                "PHP",
+                                "PKR",
+                                "PLN",
+                                "PYG",
+                                "QAR",
+                                "RON",
+                                "RSD",
+                                "RUB",
+                                "RWF",
+                                "SAR",
+                                "SBD",
+                                "SCR",
+                                "SDG",
+                                "SEK",
+                                "SGD",
+                                "SHP",
+                                "SLL",
+                                "SOS",
+                                "SPL",
+                                "SRD",
+                                "STD",
+                                "SVC",
+                                "SYP",
+                                "SZL",
+                                "THB",
+                                "TJS",
+                                "TMT",
+                                "TND",
+                                "TOP",
+                                "TRY",
+                                "TTD",
+                                "TVD",
+                                "TWD",
+                                "TZS",
+                                "UAH",
+                                "UGX",
+                                "USD",
+                                "UYU",
+                                "UZS",
+                                "VEF",
+                                "VND",
+                                "VUV",
+                                "WST",
+                                "XAF",
+                                "XCD",
+                                "XDR",
+                                "XOF",
+                                "XPF",
+                                "XTS",
+                                "XXX",
+                                "YER",
+                                "ZAR",
+                                "ZMW",
+                                "ZWD"
+                              ]
                             },
                             {
                               "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -114555,9 +136684,176 @@
                   {
                     "title": "ActiveOrHistoricCurrencyCode",
                     "type": "string",
-                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                    "pattern": "^[A-Z]{3,3}$",
-                    "example": "USD"
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
                   },
                   {
                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -114604,9 +136900,176 @@
                   {
                     "title": "ActiveOrHistoricCurrencyCode",
                     "type": "string",
-                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                    "pattern": "^[A-Z]{3,3}$",
-                    "example": "USD"
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
                   },
                   {
                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -114917,9 +137380,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -114966,9 +137596,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -115142,9 +137939,176 @@
                                           {
                                             "title": "ActiveOrHistoricCurrencyCode",
                                             "type": "string",
-                                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                            "pattern": "^[A-Z]{3,3}$",
-                                            "example": "USD"
+                                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                            "example": "USD",
+                                            "minLength": 3,
+                                            "maxLength": 3,
+                                            "enum": [
+                                              "AED",
+                                              "AFN",
+                                              "ALL",
+                                              "AMD",
+                                              "ANG",
+                                              "AOA",
+                                              "ARS",
+                                              "AUD",
+                                              "AWG",
+                                              "AZN",
+                                              "BAM",
+                                              "BBD",
+                                              "BDT",
+                                              "BGN",
+                                              "BHD",
+                                              "BIF",
+                                              "BMD",
+                                              "BND",
+                                              "BOB",
+                                              "BRL",
+                                              "BSD",
+                                              "BTN",
+                                              "BWP",
+                                              "BYN",
+                                              "BZD",
+                                              "CAD",
+                                              "CDF",
+                                              "CHF",
+                                              "CLP",
+                                              "CNY",
+                                              "COP",
+                                              "CRC",
+                                              "CUC",
+                                              "CUP",
+                                              "CVE",
+                                              "CZK",
+                                              "DJF",
+                                              "DKK",
+                                              "DOP",
+                                              "DZD",
+                                              "EGP",
+                                              "ERN",
+                                              "ETB",
+                                              "EUR",
+                                              "FJD",
+                                              "FKP",
+                                              "GBP",
+                                              "GEL",
+                                              "GGP",
+                                              "GHS",
+                                              "GIP",
+                                              "GMD",
+                                              "GNF",
+                                              "GTQ",
+                                              "GYD",
+                                              "HKD",
+                                              "HNL",
+                                              "HRK",
+                                              "HTG",
+                                              "HUF",
+                                              "IDR",
+                                              "ILS",
+                                              "IMP",
+                                              "INR",
+                                              "IQD",
+                                              "IRR",
+                                              "ISK",
+                                              "JEP",
+                                              "JMD",
+                                              "JOD",
+                                              "JPY",
+                                              "KES",
+                                              "KGS",
+                                              "KHR",
+                                              "KMF",
+                                              "KPW",
+                                              "KRW",
+                                              "KWD",
+                                              "KYD",
+                                              "KZT",
+                                              "LAK",
+                                              "LBP",
+                                              "LKR",
+                                              "LRD",
+                                              "LSL",
+                                              "LYD",
+                                              "MAD",
+                                              "MDL",
+                                              "MGA",
+                                              "MKD",
+                                              "MMK",
+                                              "MNT",
+                                              "MOP",
+                                              "MRO",
+                                              "MUR",
+                                              "MVR",
+                                              "MWK",
+                                              "MXN",
+                                              "MYR",
+                                              "MZN",
+                                              "NAD",
+                                              "NGN",
+                                              "NIO",
+                                              "NOK",
+                                              "NPR",
+                                              "NZD",
+                                              "OMR",
+                                              "PAB",
+                                              "PEN",
+                                              "PGK",
+                                              "PHP",
+                                              "PKR",
+                                              "PLN",
+                                              "PYG",
+                                              "QAR",
+                                              "RON",
+                                              "RSD",
+                                              "RUB",
+                                              "RWF",
+                                              "SAR",
+                                              "SBD",
+                                              "SCR",
+                                              "SDG",
+                                              "SEK",
+                                              "SGD",
+                                              "SHP",
+                                              "SLL",
+                                              "SOS",
+                                              "SPL",
+                                              "SRD",
+                                              "STD",
+                                              "SVC",
+                                              "SYP",
+                                              "SZL",
+                                              "THB",
+                                              "TJS",
+                                              "TMT",
+                                              "TND",
+                                              "TOP",
+                                              "TRY",
+                                              "TTD",
+                                              "TVD",
+                                              "TWD",
+                                              "TZS",
+                                              "UAH",
+                                              "UGX",
+                                              "USD",
+                                              "UYU",
+                                              "UZS",
+                                              "VEF",
+                                              "VND",
+                                              "VUV",
+                                              "WST",
+                                              "XAF",
+                                              "XCD",
+                                              "XDR",
+                                              "XOF",
+                                              "XPF",
+                                              "XTS",
+                                              "XXX",
+                                              "YER",
+                                              "ZAR",
+                                              "ZMW",
+                                              "ZWD"
+                                            ]
                                           },
                                           {
                                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -115335,9 +138299,176 @@
                                             {
                                               "title": "ActiveOrHistoricCurrencyCode",
                                               "type": "string",
-                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                              "pattern": "^[A-Z]{3,3}$",
-                                              "example": "USD"
+                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                              "example": "USD",
+                                              "minLength": 3,
+                                              "maxLength": 3,
+                                              "enum": [
+                                                "AED",
+                                                "AFN",
+                                                "ALL",
+                                                "AMD",
+                                                "ANG",
+                                                "AOA",
+                                                "ARS",
+                                                "AUD",
+                                                "AWG",
+                                                "AZN",
+                                                "BAM",
+                                                "BBD",
+                                                "BDT",
+                                                "BGN",
+                                                "BHD",
+                                                "BIF",
+                                                "BMD",
+                                                "BND",
+                                                "BOB",
+                                                "BRL",
+                                                "BSD",
+                                                "BTN",
+                                                "BWP",
+                                                "BYN",
+                                                "BZD",
+                                                "CAD",
+                                                "CDF",
+                                                "CHF",
+                                                "CLP",
+                                                "CNY",
+                                                "COP",
+                                                "CRC",
+                                                "CUC",
+                                                "CUP",
+                                                "CVE",
+                                                "CZK",
+                                                "DJF",
+                                                "DKK",
+                                                "DOP",
+                                                "DZD",
+                                                "EGP",
+                                                "ERN",
+                                                "ETB",
+                                                "EUR",
+                                                "FJD",
+                                                "FKP",
+                                                "GBP",
+                                                "GEL",
+                                                "GGP",
+                                                "GHS",
+                                                "GIP",
+                                                "GMD",
+                                                "GNF",
+                                                "GTQ",
+                                                "GYD",
+                                                "HKD",
+                                                "HNL",
+                                                "HRK",
+                                                "HTG",
+                                                "HUF",
+                                                "IDR",
+                                                "ILS",
+                                                "IMP",
+                                                "INR",
+                                                "IQD",
+                                                "IRR",
+                                                "ISK",
+                                                "JEP",
+                                                "JMD",
+                                                "JOD",
+                                                "JPY",
+                                                "KES",
+                                                "KGS",
+                                                "KHR",
+                                                "KMF",
+                                                "KPW",
+                                                "KRW",
+                                                "KWD",
+                                                "KYD",
+                                                "KZT",
+                                                "LAK",
+                                                "LBP",
+                                                "LKR",
+                                                "LRD",
+                                                "LSL",
+                                                "LYD",
+                                                "MAD",
+                                                "MDL",
+                                                "MGA",
+                                                "MKD",
+                                                "MMK",
+                                                "MNT",
+                                                "MOP",
+                                                "MRO",
+                                                "MUR",
+                                                "MVR",
+                                                "MWK",
+                                                "MXN",
+                                                "MYR",
+                                                "MZN",
+                                                "NAD",
+                                                "NGN",
+                                                "NIO",
+                                                "NOK",
+                                                "NPR",
+                                                "NZD",
+                                                "OMR",
+                                                "PAB",
+                                                "PEN",
+                                                "PGK",
+                                                "PHP",
+                                                "PKR",
+                                                "PLN",
+                                                "PYG",
+                                                "QAR",
+                                                "RON",
+                                                "RSD",
+                                                "RUB",
+                                                "RWF",
+                                                "SAR",
+                                                "SBD",
+                                                "SCR",
+                                                "SDG",
+                                                "SEK",
+                                                "SGD",
+                                                "SHP",
+                                                "SLL",
+                                                "SOS",
+                                                "SPL",
+                                                "SRD",
+                                                "STD",
+                                                "SVC",
+                                                "SYP",
+                                                "SZL",
+                                                "THB",
+                                                "TJS",
+                                                "TMT",
+                                                "TND",
+                                                "TOP",
+                                                "TRY",
+                                                "TTD",
+                                                "TVD",
+                                                "TWD",
+                                                "TZS",
+                                                "UAH",
+                                                "UGX",
+                                                "USD",
+                                                "UYU",
+                                                "UZS",
+                                                "VEF",
+                                                "VND",
+                                                "VUV",
+                                                "WST",
+                                                "XAF",
+                                                "XCD",
+                                                "XDR",
+                                                "XOF",
+                                                "XPF",
+                                                "XTS",
+                                                "XXX",
+                                                "YER",
+                                                "ZAR",
+                                                "ZMW",
+                                                "ZWD"
+                                              ]
                                             },
                                             {
                                               "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -115715,9 +138846,176 @@
                                     {
                                       "title": "ActiveOrHistoricCurrencyCode",
                                       "type": "string",
-                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                      "pattern": "^[A-Z]{3,3}$",
-                                      "example": "USD"
+                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                      "example": "USD",
+                                      "minLength": 3,
+                                      "maxLength": 3,
+                                      "enum": [
+                                        "AED",
+                                        "AFN",
+                                        "ALL",
+                                        "AMD",
+                                        "ANG",
+                                        "AOA",
+                                        "ARS",
+                                        "AUD",
+                                        "AWG",
+                                        "AZN",
+                                        "BAM",
+                                        "BBD",
+                                        "BDT",
+                                        "BGN",
+                                        "BHD",
+                                        "BIF",
+                                        "BMD",
+                                        "BND",
+                                        "BOB",
+                                        "BRL",
+                                        "BSD",
+                                        "BTN",
+                                        "BWP",
+                                        "BYN",
+                                        "BZD",
+                                        "CAD",
+                                        "CDF",
+                                        "CHF",
+                                        "CLP",
+                                        "CNY",
+                                        "COP",
+                                        "CRC",
+                                        "CUC",
+                                        "CUP",
+                                        "CVE",
+                                        "CZK",
+                                        "DJF",
+                                        "DKK",
+                                        "DOP",
+                                        "DZD",
+                                        "EGP",
+                                        "ERN",
+                                        "ETB",
+                                        "EUR",
+                                        "FJD",
+                                        "FKP",
+                                        "GBP",
+                                        "GEL",
+                                        "GGP",
+                                        "GHS",
+                                        "GIP",
+                                        "GMD",
+                                        "GNF",
+                                        "GTQ",
+                                        "GYD",
+                                        "HKD",
+                                        "HNL",
+                                        "HRK",
+                                        "HTG",
+                                        "HUF",
+                                        "IDR",
+                                        "ILS",
+                                        "IMP",
+                                        "INR",
+                                        "IQD",
+                                        "IRR",
+                                        "ISK",
+                                        "JEP",
+                                        "JMD",
+                                        "JOD",
+                                        "JPY",
+                                        "KES",
+                                        "KGS",
+                                        "KHR",
+                                        "KMF",
+                                        "KPW",
+                                        "KRW",
+                                        "KWD",
+                                        "KYD",
+                                        "KZT",
+                                        "LAK",
+                                        "LBP",
+                                        "LKR",
+                                        "LRD",
+                                        "LSL",
+                                        "LYD",
+                                        "MAD",
+                                        "MDL",
+                                        "MGA",
+                                        "MKD",
+                                        "MMK",
+                                        "MNT",
+                                        "MOP",
+                                        "MRO",
+                                        "MUR",
+                                        "MVR",
+                                        "MWK",
+                                        "MXN",
+                                        "MYR",
+                                        "MZN",
+                                        "NAD",
+                                        "NGN",
+                                        "NIO",
+                                        "NOK",
+                                        "NPR",
+                                        "NZD",
+                                        "OMR",
+                                        "PAB",
+                                        "PEN",
+                                        "PGK",
+                                        "PHP",
+                                        "PKR",
+                                        "PLN",
+                                        "PYG",
+                                        "QAR",
+                                        "RON",
+                                        "RSD",
+                                        "RUB",
+                                        "RWF",
+                                        "SAR",
+                                        "SBD",
+                                        "SCR",
+                                        "SDG",
+                                        "SEK",
+                                        "SGD",
+                                        "SHP",
+                                        "SLL",
+                                        "SOS",
+                                        "SPL",
+                                        "SRD",
+                                        "STD",
+                                        "SVC",
+                                        "SYP",
+                                        "SZL",
+                                        "THB",
+                                        "TJS",
+                                        "TMT",
+                                        "TND",
+                                        "TOP",
+                                        "TRY",
+                                        "TTD",
+                                        "TVD",
+                                        "TWD",
+                                        "TZS",
+                                        "UAH",
+                                        "UGX",
+                                        "USD",
+                                        "UYU",
+                                        "UZS",
+                                        "VEF",
+                                        "VND",
+                                        "VUV",
+                                        "WST",
+                                        "XAF",
+                                        "XCD",
+                                        "XDR",
+                                        "XOF",
+                                        "XPF",
+                                        "XTS",
+                                        "XXX",
+                                        "YER",
+                                        "ZAR",
+                                        "ZMW",
+                                        "ZWD"
+                                      ]
                                     },
                                     {
                                       "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -115764,9 +139062,176 @@
                                     {
                                       "title": "ActiveOrHistoricCurrencyCode",
                                       "type": "string",
-                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                      "pattern": "^[A-Z]{3,3}$",
-                                      "example": "USD"
+                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                      "example": "USD",
+                                      "minLength": 3,
+                                      "maxLength": 3,
+                                      "enum": [
+                                        "AED",
+                                        "AFN",
+                                        "ALL",
+                                        "AMD",
+                                        "ANG",
+                                        "AOA",
+                                        "ARS",
+                                        "AUD",
+                                        "AWG",
+                                        "AZN",
+                                        "BAM",
+                                        "BBD",
+                                        "BDT",
+                                        "BGN",
+                                        "BHD",
+                                        "BIF",
+                                        "BMD",
+                                        "BND",
+                                        "BOB",
+                                        "BRL",
+                                        "BSD",
+                                        "BTN",
+                                        "BWP",
+                                        "BYN",
+                                        "BZD",
+                                        "CAD",
+                                        "CDF",
+                                        "CHF",
+                                        "CLP",
+                                        "CNY",
+                                        "COP",
+                                        "CRC",
+                                        "CUC",
+                                        "CUP",
+                                        "CVE",
+                                        "CZK",
+                                        "DJF",
+                                        "DKK",
+                                        "DOP",
+                                        "DZD",
+                                        "EGP",
+                                        "ERN",
+                                        "ETB",
+                                        "EUR",
+                                        "FJD",
+                                        "FKP",
+                                        "GBP",
+                                        "GEL",
+                                        "GGP",
+                                        "GHS",
+                                        "GIP",
+                                        "GMD",
+                                        "GNF",
+                                        "GTQ",
+                                        "GYD",
+                                        "HKD",
+                                        "HNL",
+                                        "HRK",
+                                        "HTG",
+                                        "HUF",
+                                        "IDR",
+                                        "ILS",
+                                        "IMP",
+                                        "INR",
+                                        "IQD",
+                                        "IRR",
+                                        "ISK",
+                                        "JEP",
+                                        "JMD",
+                                        "JOD",
+                                        "JPY",
+                                        "KES",
+                                        "KGS",
+                                        "KHR",
+                                        "KMF",
+                                        "KPW",
+                                        "KRW",
+                                        "KWD",
+                                        "KYD",
+                                        "KZT",
+                                        "LAK",
+                                        "LBP",
+                                        "LKR",
+                                        "LRD",
+                                        "LSL",
+                                        "LYD",
+                                        "MAD",
+                                        "MDL",
+                                        "MGA",
+                                        "MKD",
+                                        "MMK",
+                                        "MNT",
+                                        "MOP",
+                                        "MRO",
+                                        "MUR",
+                                        "MVR",
+                                        "MWK",
+                                        "MXN",
+                                        "MYR",
+                                        "MZN",
+                                        "NAD",
+                                        "NGN",
+                                        "NIO",
+                                        "NOK",
+                                        "NPR",
+                                        "NZD",
+                                        "OMR",
+                                        "PAB",
+                                        "PEN",
+                                        "PGK",
+                                        "PHP",
+                                        "PKR",
+                                        "PLN",
+                                        "PYG",
+                                        "QAR",
+                                        "RON",
+                                        "RSD",
+                                        "RUB",
+                                        "RWF",
+                                        "SAR",
+                                        "SBD",
+                                        "SCR",
+                                        "SDG",
+                                        "SEK",
+                                        "SGD",
+                                        "SHP",
+                                        "SLL",
+                                        "SOS",
+                                        "SPL",
+                                        "SRD",
+                                        "STD",
+                                        "SVC",
+                                        "SYP",
+                                        "SZL",
+                                        "THB",
+                                        "TJS",
+                                        "TMT",
+                                        "TND",
+                                        "TOP",
+                                        "TRY",
+                                        "TTD",
+                                        "TVD",
+                                        "TWD",
+                                        "TZS",
+                                        "UAH",
+                                        "UGX",
+                                        "USD",
+                                        "UYU",
+                                        "UZS",
+                                        "VEF",
+                                        "VND",
+                                        "VUV",
+                                        "WST",
+                                        "XAF",
+                                        "XCD",
+                                        "XDR",
+                                        "XOF",
+                                        "XPF",
+                                        "XTS",
+                                        "XXX",
+                                        "YER",
+                                        "ZAR",
+                                        "ZMW",
+                                        "ZWD"
+                                      ]
                                     },
                                     {
                                       "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -115940,9 +139405,176 @@
                                             {
                                               "title": "ActiveOrHistoricCurrencyCode",
                                               "type": "string",
-                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                              "pattern": "^[A-Z]{3,3}$",
-                                              "example": "USD"
+                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                              "example": "USD",
+                                              "minLength": 3,
+                                              "maxLength": 3,
+                                              "enum": [
+                                                "AED",
+                                                "AFN",
+                                                "ALL",
+                                                "AMD",
+                                                "ANG",
+                                                "AOA",
+                                                "ARS",
+                                                "AUD",
+                                                "AWG",
+                                                "AZN",
+                                                "BAM",
+                                                "BBD",
+                                                "BDT",
+                                                "BGN",
+                                                "BHD",
+                                                "BIF",
+                                                "BMD",
+                                                "BND",
+                                                "BOB",
+                                                "BRL",
+                                                "BSD",
+                                                "BTN",
+                                                "BWP",
+                                                "BYN",
+                                                "BZD",
+                                                "CAD",
+                                                "CDF",
+                                                "CHF",
+                                                "CLP",
+                                                "CNY",
+                                                "COP",
+                                                "CRC",
+                                                "CUC",
+                                                "CUP",
+                                                "CVE",
+                                                "CZK",
+                                                "DJF",
+                                                "DKK",
+                                                "DOP",
+                                                "DZD",
+                                                "EGP",
+                                                "ERN",
+                                                "ETB",
+                                                "EUR",
+                                                "FJD",
+                                                "FKP",
+                                                "GBP",
+                                                "GEL",
+                                                "GGP",
+                                                "GHS",
+                                                "GIP",
+                                                "GMD",
+                                                "GNF",
+                                                "GTQ",
+                                                "GYD",
+                                                "HKD",
+                                                "HNL",
+                                                "HRK",
+                                                "HTG",
+                                                "HUF",
+                                                "IDR",
+                                                "ILS",
+                                                "IMP",
+                                                "INR",
+                                                "IQD",
+                                                "IRR",
+                                                "ISK",
+                                                "JEP",
+                                                "JMD",
+                                                "JOD",
+                                                "JPY",
+                                                "KES",
+                                                "KGS",
+                                                "KHR",
+                                                "KMF",
+                                                "KPW",
+                                                "KRW",
+                                                "KWD",
+                                                "KYD",
+                                                "KZT",
+                                                "LAK",
+                                                "LBP",
+                                                "LKR",
+                                                "LRD",
+                                                "LSL",
+                                                "LYD",
+                                                "MAD",
+                                                "MDL",
+                                                "MGA",
+                                                "MKD",
+                                                "MMK",
+                                                "MNT",
+                                                "MOP",
+                                                "MRO",
+                                                "MUR",
+                                                "MVR",
+                                                "MWK",
+                                                "MXN",
+                                                "MYR",
+                                                "MZN",
+                                                "NAD",
+                                                "NGN",
+                                                "NIO",
+                                                "NOK",
+                                                "NPR",
+                                                "NZD",
+                                                "OMR",
+                                                "PAB",
+                                                "PEN",
+                                                "PGK",
+                                                "PHP",
+                                                "PKR",
+                                                "PLN",
+                                                "PYG",
+                                                "QAR",
+                                                "RON",
+                                                "RSD",
+                                                "RUB",
+                                                "RWF",
+                                                "SAR",
+                                                "SBD",
+                                                "SCR",
+                                                "SDG",
+                                                "SEK",
+                                                "SGD",
+                                                "SHP",
+                                                "SLL",
+                                                "SOS",
+                                                "SPL",
+                                                "SRD",
+                                                "STD",
+                                                "SVC",
+                                                "SYP",
+                                                "SZL",
+                                                "THB",
+                                                "TJS",
+                                                "TMT",
+                                                "TND",
+                                                "TOP",
+                                                "TRY",
+                                                "TTD",
+                                                "TVD",
+                                                "TWD",
+                                                "TZS",
+                                                "UAH",
+                                                "UGX",
+                                                "USD",
+                                                "UYU",
+                                                "UZS",
+                                                "VEF",
+                                                "VND",
+                                                "VUV",
+                                                "WST",
+                                                "XAF",
+                                                "XCD",
+                                                "XDR",
+                                                "XOF",
+                                                "XPF",
+                                                "XTS",
+                                                "XXX",
+                                                "YER",
+                                                "ZAR",
+                                                "ZMW",
+                                                "ZWD"
+                                              ]
                                             },
                                             {
                                               "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -116133,9 +139765,176 @@
                                               {
                                                 "title": "ActiveOrHistoricCurrencyCode",
                                                 "type": "string",
-                                                "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                "pattern": "^[A-Z]{3,3}$",
-                                                "example": "USD"
+                                                "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                "example": "USD",
+                                                "minLength": 3,
+                                                "maxLength": 3,
+                                                "enum": [
+                                                  "AED",
+                                                  "AFN",
+                                                  "ALL",
+                                                  "AMD",
+                                                  "ANG",
+                                                  "AOA",
+                                                  "ARS",
+                                                  "AUD",
+                                                  "AWG",
+                                                  "AZN",
+                                                  "BAM",
+                                                  "BBD",
+                                                  "BDT",
+                                                  "BGN",
+                                                  "BHD",
+                                                  "BIF",
+                                                  "BMD",
+                                                  "BND",
+                                                  "BOB",
+                                                  "BRL",
+                                                  "BSD",
+                                                  "BTN",
+                                                  "BWP",
+                                                  "BYN",
+                                                  "BZD",
+                                                  "CAD",
+                                                  "CDF",
+                                                  "CHF",
+                                                  "CLP",
+                                                  "CNY",
+                                                  "COP",
+                                                  "CRC",
+                                                  "CUC",
+                                                  "CUP",
+                                                  "CVE",
+                                                  "CZK",
+                                                  "DJF",
+                                                  "DKK",
+                                                  "DOP",
+                                                  "DZD",
+                                                  "EGP",
+                                                  "ERN",
+                                                  "ETB",
+                                                  "EUR",
+                                                  "FJD",
+                                                  "FKP",
+                                                  "GBP",
+                                                  "GEL",
+                                                  "GGP",
+                                                  "GHS",
+                                                  "GIP",
+                                                  "GMD",
+                                                  "GNF",
+                                                  "GTQ",
+                                                  "GYD",
+                                                  "HKD",
+                                                  "HNL",
+                                                  "HRK",
+                                                  "HTG",
+                                                  "HUF",
+                                                  "IDR",
+                                                  "ILS",
+                                                  "IMP",
+                                                  "INR",
+                                                  "IQD",
+                                                  "IRR",
+                                                  "ISK",
+                                                  "JEP",
+                                                  "JMD",
+                                                  "JOD",
+                                                  "JPY",
+                                                  "KES",
+                                                  "KGS",
+                                                  "KHR",
+                                                  "KMF",
+                                                  "KPW",
+                                                  "KRW",
+                                                  "KWD",
+                                                  "KYD",
+                                                  "KZT",
+                                                  "LAK",
+                                                  "LBP",
+                                                  "LKR",
+                                                  "LRD",
+                                                  "LSL",
+                                                  "LYD",
+                                                  "MAD",
+                                                  "MDL",
+                                                  "MGA",
+                                                  "MKD",
+                                                  "MMK",
+                                                  "MNT",
+                                                  "MOP",
+                                                  "MRO",
+                                                  "MUR",
+                                                  "MVR",
+                                                  "MWK",
+                                                  "MXN",
+                                                  "MYR",
+                                                  "MZN",
+                                                  "NAD",
+                                                  "NGN",
+                                                  "NIO",
+                                                  "NOK",
+                                                  "NPR",
+                                                  "NZD",
+                                                  "OMR",
+                                                  "PAB",
+                                                  "PEN",
+                                                  "PGK",
+                                                  "PHP",
+                                                  "PKR",
+                                                  "PLN",
+                                                  "PYG",
+                                                  "QAR",
+                                                  "RON",
+                                                  "RSD",
+                                                  "RUB",
+                                                  "RWF",
+                                                  "SAR",
+                                                  "SBD",
+                                                  "SCR",
+                                                  "SDG",
+                                                  "SEK",
+                                                  "SGD",
+                                                  "SHP",
+                                                  "SLL",
+                                                  "SOS",
+                                                  "SPL",
+                                                  "SRD",
+                                                  "STD",
+                                                  "SVC",
+                                                  "SYP",
+                                                  "SZL",
+                                                  "THB",
+                                                  "TJS",
+                                                  "TMT",
+                                                  "TND",
+                                                  "TOP",
+                                                  "TRY",
+                                                  "TTD",
+                                                  "TVD",
+                                                  "TWD",
+                                                  "TZS",
+                                                  "UAH",
+                                                  "UGX",
+                                                  "USD",
+                                                  "UYU",
+                                                  "UZS",
+                                                  "VEF",
+                                                  "VND",
+                                                  "VUV",
+                                                  "WST",
+                                                  "XAF",
+                                                  "XCD",
+                                                  "XDR",
+                                                  "XOF",
+                                                  "XPF",
+                                                  "XTS",
+                                                  "XXX",
+                                                  "YER",
+                                                  "ZAR",
+                                                  "ZMW",
+                                                  "ZWD"
+                                                ]
                                               },
                                               {
                                                 "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -116833,9 +140632,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -116882,9 +140848,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -117058,9 +141191,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -117251,9 +141551,176 @@
                                     {
                                       "title": "ActiveOrHistoricCurrencyCode",
                                       "type": "string",
-                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                      "pattern": "^[A-Z]{3,3}$",
-                                      "example": "USD"
+                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                      "example": "USD",
+                                      "minLength": 3,
+                                      "maxLength": 3,
+                                      "enum": [
+                                        "AED",
+                                        "AFN",
+                                        "ALL",
+                                        "AMD",
+                                        "ANG",
+                                        "AOA",
+                                        "ARS",
+                                        "AUD",
+                                        "AWG",
+                                        "AZN",
+                                        "BAM",
+                                        "BBD",
+                                        "BDT",
+                                        "BGN",
+                                        "BHD",
+                                        "BIF",
+                                        "BMD",
+                                        "BND",
+                                        "BOB",
+                                        "BRL",
+                                        "BSD",
+                                        "BTN",
+                                        "BWP",
+                                        "BYN",
+                                        "BZD",
+                                        "CAD",
+                                        "CDF",
+                                        "CHF",
+                                        "CLP",
+                                        "CNY",
+                                        "COP",
+                                        "CRC",
+                                        "CUC",
+                                        "CUP",
+                                        "CVE",
+                                        "CZK",
+                                        "DJF",
+                                        "DKK",
+                                        "DOP",
+                                        "DZD",
+                                        "EGP",
+                                        "ERN",
+                                        "ETB",
+                                        "EUR",
+                                        "FJD",
+                                        "FKP",
+                                        "GBP",
+                                        "GEL",
+                                        "GGP",
+                                        "GHS",
+                                        "GIP",
+                                        "GMD",
+                                        "GNF",
+                                        "GTQ",
+                                        "GYD",
+                                        "HKD",
+                                        "HNL",
+                                        "HRK",
+                                        "HTG",
+                                        "HUF",
+                                        "IDR",
+                                        "ILS",
+                                        "IMP",
+                                        "INR",
+                                        "IQD",
+                                        "IRR",
+                                        "ISK",
+                                        "JEP",
+                                        "JMD",
+                                        "JOD",
+                                        "JPY",
+                                        "KES",
+                                        "KGS",
+                                        "KHR",
+                                        "KMF",
+                                        "KPW",
+                                        "KRW",
+                                        "KWD",
+                                        "KYD",
+                                        "KZT",
+                                        "LAK",
+                                        "LBP",
+                                        "LKR",
+                                        "LRD",
+                                        "LSL",
+                                        "LYD",
+                                        "MAD",
+                                        "MDL",
+                                        "MGA",
+                                        "MKD",
+                                        "MMK",
+                                        "MNT",
+                                        "MOP",
+                                        "MRO",
+                                        "MUR",
+                                        "MVR",
+                                        "MWK",
+                                        "MXN",
+                                        "MYR",
+                                        "MZN",
+                                        "NAD",
+                                        "NGN",
+                                        "NIO",
+                                        "NOK",
+                                        "NPR",
+                                        "NZD",
+                                        "OMR",
+                                        "PAB",
+                                        "PEN",
+                                        "PGK",
+                                        "PHP",
+                                        "PKR",
+                                        "PLN",
+                                        "PYG",
+                                        "QAR",
+                                        "RON",
+                                        "RSD",
+                                        "RUB",
+                                        "RWF",
+                                        "SAR",
+                                        "SBD",
+                                        "SCR",
+                                        "SDG",
+                                        "SEK",
+                                        "SGD",
+                                        "SHP",
+                                        "SLL",
+                                        "SOS",
+                                        "SPL",
+                                        "SRD",
+                                        "STD",
+                                        "SVC",
+                                        "SYP",
+                                        "SZL",
+                                        "THB",
+                                        "TJS",
+                                        "TMT",
+                                        "TND",
+                                        "TOP",
+                                        "TRY",
+                                        "TTD",
+                                        "TVD",
+                                        "TWD",
+                                        "TZS",
+                                        "UAH",
+                                        "UGX",
+                                        "USD",
+                                        "UYU",
+                                        "UZS",
+                                        "VEF",
+                                        "VND",
+                                        "VUV",
+                                        "WST",
+                                        "XAF",
+                                        "XCD",
+                                        "XDR",
+                                        "XOF",
+                                        "XPF",
+                                        "XTS",
+                                        "XXX",
+                                        "YER",
+                                        "ZAR",
+                                        "ZMW",
+                                        "ZWD"
+                                      ]
                                     },
                                     {
                                       "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -117520,9 +141987,176 @@
                   {
                     "title": "ActiveOrHistoricCurrencyCode",
                     "type": "string",
-                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                    "pattern": "^[A-Z]{3,3}$",
-                    "example": "USD"
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
                   },
                   {
                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -118002,45 +142636,39 @@
                       "InstrId": {
                         "allOf": [
                           {
-                            "title": "Max35Text",
-                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "title": "ULIDIdentifier",
                             "type": "string",
-                            "minLength": 1,
-                            "maxLength": 35,
-                            "example": 1.234567890123457e+34
+                            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                            "example": "01AN4Z07BY79KA1307SR9X4MV3"
                           },
                           {
-                            "description": "InstructionIdentification (FSPIOP equivalent: transactionRequestId)\n\nDefinition: Unique identification, as assigned by an instructing party for an instructed party, to\nunambiguously identify the instruction.\n\nUsage: The instruction identification is a point to point reference that can be used between the\ninstructing party and the instructed party to refer to the individual instruction. It can be included in\nseveral messages related to the instruction.\n"
+                            "description": "InstructionIdentification (FSPIOP equivalent: transactionRequestId)\n\nDefinition: Unique identification, as assigned by an instructing party for an instructed party, to\nunambiguously identify the instruction.\n\nUsage: The instruction identification is a point to point reference that can be used between the\ninstructing party and the instructed party to refer to the individual instruction. It can be included in\nseveral messages related to the instruction.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                           }
                         ]
                       },
                       "EndToEndId": {
                         "allOf": [
                           {
-                            "title": "Max35Text",
-                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "title": "ULIDIdentifier",
                             "type": "string",
-                            "minLength": 1,
-                            "maxLength": 35,
-                            "example": 1.234567890123457e+34
+                            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                            "example": "01AN4Z07BY79KA1307SR9X4MV3"
                           },
                           {
-                            "description": "EndToEndIdentification (FSPIOP equivalent: transactionId)\n\nDefinition: Unique identification, as assigned by the initiating party, to unambiguously identify the\ntransaction. This identification is passed on, unchanged, throughout the entire end-to-end chain.\n\nUsage: The end-to-end identification can be used for reconciliation or to link tasks relating to the\ntransaction. It can be included in several messages related to the transaction.\n\nUsage: In case there are technical limitations to pass on multiple references, the end-to-end\nidentification must be passed on throughout the entire end-to-end chain.\n"
+                            "description": "EndToEndIdentification (FSPIOP equivalent: transactionId)\n\nDefinition: Unique identification, as assigned by the initiating party, to unambiguously identify the\ntransaction. This identification is passed on, unchanged, throughout the entire end-to-end chain.\n\nUsage: The end-to-end identification can be used for reconciliation or to link tasks relating to the\ntransaction. It can be included in several messages related to the transaction.\n\nUsage: In case there are technical limitations to pass on multiple references, the end-to-end\nidentification must be passed on throughout the entire end-to-end chain.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                           }
                         ]
                       },
                       "TxId": {
                         "allOf": [
                           {
-                            "title": "Max35Text",
-                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "title": "ULIDIdentifier",
                             "type": "string",
-                            "minLength": 1,
-                            "maxLength": 35,
-                            "example": 1.234567890123457e+34
+                            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                            "example": "01AN4Z07BY79KA1307SR9X4MV3"
                           },
                           {
-                            "description": "TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)\n\nDefinition: Unique identification, as assigned by the first instructing agent, to unambiguously identify the\ntransaction that is passed on, unchanged, throughout the entire interbank chain.\n\nUsage: The transaction identification can be used for reconciliation, tracking or to link tasks relating to\nthe transaction on the interbank level.\n\nUsage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.\n"
+                            "description": "TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)\n\nDefinition: Unique identification, as assigned by the first instructing agent, to unambiguously identify the\ntransaction that is passed on, unchanged, throughout the entire interbank chain.\n\nUsage: The transaction identification can be used for reconciliation, tracking or to link tasks relating to\nthe transaction on the interbank level.\n\nUsage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                           }
                         ]
                       },
@@ -118351,9 +142979,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -122406,9 +147201,176 @@
                           {
                             "title": "ActiveCurrencyCode",
                             "type": "string",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -122455,9 +147417,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -122536,9 +147665,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -124916,9 +150212,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -128241,9 +153704,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -128706,9 +154336,176 @@
                                           {
                                             "title": "ActiveOrHistoricCurrencyCode",
                                             "type": "string",
-                                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                            "pattern": "^[A-Z]{3,3}$",
-                                            "example": "USD"
+                                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                            "example": "USD",
+                                            "minLength": 3,
+                                            "maxLength": 3,
+                                            "enum": [
+                                              "AED",
+                                              "AFN",
+                                              "ALL",
+                                              "AMD",
+                                              "ANG",
+                                              "AOA",
+                                              "ARS",
+                                              "AUD",
+                                              "AWG",
+                                              "AZN",
+                                              "BAM",
+                                              "BBD",
+                                              "BDT",
+                                              "BGN",
+                                              "BHD",
+                                              "BIF",
+                                              "BMD",
+                                              "BND",
+                                              "BOB",
+                                              "BRL",
+                                              "BSD",
+                                              "BTN",
+                                              "BWP",
+                                              "BYN",
+                                              "BZD",
+                                              "CAD",
+                                              "CDF",
+                                              "CHF",
+                                              "CLP",
+                                              "CNY",
+                                              "COP",
+                                              "CRC",
+                                              "CUC",
+                                              "CUP",
+                                              "CVE",
+                                              "CZK",
+                                              "DJF",
+                                              "DKK",
+                                              "DOP",
+                                              "DZD",
+                                              "EGP",
+                                              "ERN",
+                                              "ETB",
+                                              "EUR",
+                                              "FJD",
+                                              "FKP",
+                                              "GBP",
+                                              "GEL",
+                                              "GGP",
+                                              "GHS",
+                                              "GIP",
+                                              "GMD",
+                                              "GNF",
+                                              "GTQ",
+                                              "GYD",
+                                              "HKD",
+                                              "HNL",
+                                              "HRK",
+                                              "HTG",
+                                              "HUF",
+                                              "IDR",
+                                              "ILS",
+                                              "IMP",
+                                              "INR",
+                                              "IQD",
+                                              "IRR",
+                                              "ISK",
+                                              "JEP",
+                                              "JMD",
+                                              "JOD",
+                                              "JPY",
+                                              "KES",
+                                              "KGS",
+                                              "KHR",
+                                              "KMF",
+                                              "KPW",
+                                              "KRW",
+                                              "KWD",
+                                              "KYD",
+                                              "KZT",
+                                              "LAK",
+                                              "LBP",
+                                              "LKR",
+                                              "LRD",
+                                              "LSL",
+                                              "LYD",
+                                              "MAD",
+                                              "MDL",
+                                              "MGA",
+                                              "MKD",
+                                              "MMK",
+                                              "MNT",
+                                              "MOP",
+                                              "MRO",
+                                              "MUR",
+                                              "MVR",
+                                              "MWK",
+                                              "MXN",
+                                              "MYR",
+                                              "MZN",
+                                              "NAD",
+                                              "NGN",
+                                              "NIO",
+                                              "NOK",
+                                              "NPR",
+                                              "NZD",
+                                              "OMR",
+                                              "PAB",
+                                              "PEN",
+                                              "PGK",
+                                              "PHP",
+                                              "PKR",
+                                              "PLN",
+                                              "PYG",
+                                              "QAR",
+                                              "RON",
+                                              "RSD",
+                                              "RUB",
+                                              "RWF",
+                                              "SAR",
+                                              "SBD",
+                                              "SCR",
+                                              "SDG",
+                                              "SEK",
+                                              "SGD",
+                                              "SHP",
+                                              "SLL",
+                                              "SOS",
+                                              "SPL",
+                                              "SRD",
+                                              "STD",
+                                              "SVC",
+                                              "SYP",
+                                              "SZL",
+                                              "THB",
+                                              "TJS",
+                                              "TMT",
+                                              "TND",
+                                              "TOP",
+                                              "TRY",
+                                              "TTD",
+                                              "TVD",
+                                              "TWD",
+                                              "TZS",
+                                              "UAH",
+                                              "UGX",
+                                              "USD",
+                                              "UYU",
+                                              "UZS",
+                                              "VEF",
+                                              "VND",
+                                              "VUV",
+                                              "WST",
+                                              "XAF",
+                                              "XCD",
+                                              "XDR",
+                                              "XOF",
+                                              "XPF",
+                                              "XTS",
+                                              "XXX",
+                                              "YER",
+                                              "ZAR",
+                                              "ZMW",
+                                              "ZWD"
+                                            ]
                                           },
                                           {
                                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -128856,9 +154653,176 @@
                                             {
                                               "title": "ActiveOrHistoricCurrencyCode",
                                               "type": "string",
-                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                              "pattern": "^[A-Z]{3,3}$",
-                                              "example": "USD"
+                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                              "example": "USD",
+                                              "minLength": 3,
+                                              "maxLength": 3,
+                                              "enum": [
+                                                "AED",
+                                                "AFN",
+                                                "ALL",
+                                                "AMD",
+                                                "ANG",
+                                                "AOA",
+                                                "ARS",
+                                                "AUD",
+                                                "AWG",
+                                                "AZN",
+                                                "BAM",
+                                                "BBD",
+                                                "BDT",
+                                                "BGN",
+                                                "BHD",
+                                                "BIF",
+                                                "BMD",
+                                                "BND",
+                                                "BOB",
+                                                "BRL",
+                                                "BSD",
+                                                "BTN",
+                                                "BWP",
+                                                "BYN",
+                                                "BZD",
+                                                "CAD",
+                                                "CDF",
+                                                "CHF",
+                                                "CLP",
+                                                "CNY",
+                                                "COP",
+                                                "CRC",
+                                                "CUC",
+                                                "CUP",
+                                                "CVE",
+                                                "CZK",
+                                                "DJF",
+                                                "DKK",
+                                                "DOP",
+                                                "DZD",
+                                                "EGP",
+                                                "ERN",
+                                                "ETB",
+                                                "EUR",
+                                                "FJD",
+                                                "FKP",
+                                                "GBP",
+                                                "GEL",
+                                                "GGP",
+                                                "GHS",
+                                                "GIP",
+                                                "GMD",
+                                                "GNF",
+                                                "GTQ",
+                                                "GYD",
+                                                "HKD",
+                                                "HNL",
+                                                "HRK",
+                                                "HTG",
+                                                "HUF",
+                                                "IDR",
+                                                "ILS",
+                                                "IMP",
+                                                "INR",
+                                                "IQD",
+                                                "IRR",
+                                                "ISK",
+                                                "JEP",
+                                                "JMD",
+                                                "JOD",
+                                                "JPY",
+                                                "KES",
+                                                "KGS",
+                                                "KHR",
+                                                "KMF",
+                                                "KPW",
+                                                "KRW",
+                                                "KWD",
+                                                "KYD",
+                                                "KZT",
+                                                "LAK",
+                                                "LBP",
+                                                "LKR",
+                                                "LRD",
+                                                "LSL",
+                                                "LYD",
+                                                "MAD",
+                                                "MDL",
+                                                "MGA",
+                                                "MKD",
+                                                "MMK",
+                                                "MNT",
+                                                "MOP",
+                                                "MRO",
+                                                "MUR",
+                                                "MVR",
+                                                "MWK",
+                                                "MXN",
+                                                "MYR",
+                                                "MZN",
+                                                "NAD",
+                                                "NGN",
+                                                "NIO",
+                                                "NOK",
+                                                "NPR",
+                                                "NZD",
+                                                "OMR",
+                                                "PAB",
+                                                "PEN",
+                                                "PGK",
+                                                "PHP",
+                                                "PKR",
+                                                "PLN",
+                                                "PYG",
+                                                "QAR",
+                                                "RON",
+                                                "RSD",
+                                                "RUB",
+                                                "RWF",
+                                                "SAR",
+                                                "SBD",
+                                                "SCR",
+                                                "SDG",
+                                                "SEK",
+                                                "SGD",
+                                                "SHP",
+                                                "SLL",
+                                                "SOS",
+                                                "SPL",
+                                                "SRD",
+                                                "STD",
+                                                "SVC",
+                                                "SYP",
+                                                "SZL",
+                                                "THB",
+                                                "TJS",
+                                                "TMT",
+                                                "TND",
+                                                "TOP",
+                                                "TRY",
+                                                "TTD",
+                                                "TVD",
+                                                "TWD",
+                                                "TZS",
+                                                "UAH",
+                                                "UGX",
+                                                "USD",
+                                                "UYU",
+                                                "UZS",
+                                                "VEF",
+                                                "VND",
+                                                "VUV",
+                                                "WST",
+                                                "XAF",
+                                                "XCD",
+                                                "XDR",
+                                                "XOF",
+                                                "XPF",
+                                                "XTS",
+                                                "XXX",
+                                                "YER",
+                                                "ZAR",
+                                                "ZMW",
+                                                "ZWD"
+                                              ]
                                             },
                                             {
                                               "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -129312,9 +155276,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -129361,9 +155492,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -129674,9 +155972,176 @@
                                                   {
                                                     "title": "ActiveOrHistoricCurrencyCode",
                                                     "type": "string",
-                                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                    "pattern": "^[A-Z]{3,3}$",
-                                                    "example": "USD"
+                                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                    "example": "USD",
+                                                    "minLength": 3,
+                                                    "maxLength": 3,
+                                                    "enum": [
+                                                      "AED",
+                                                      "AFN",
+                                                      "ALL",
+                                                      "AMD",
+                                                      "ANG",
+                                                      "AOA",
+                                                      "ARS",
+                                                      "AUD",
+                                                      "AWG",
+                                                      "AZN",
+                                                      "BAM",
+                                                      "BBD",
+                                                      "BDT",
+                                                      "BGN",
+                                                      "BHD",
+                                                      "BIF",
+                                                      "BMD",
+                                                      "BND",
+                                                      "BOB",
+                                                      "BRL",
+                                                      "BSD",
+                                                      "BTN",
+                                                      "BWP",
+                                                      "BYN",
+                                                      "BZD",
+                                                      "CAD",
+                                                      "CDF",
+                                                      "CHF",
+                                                      "CLP",
+                                                      "CNY",
+                                                      "COP",
+                                                      "CRC",
+                                                      "CUC",
+                                                      "CUP",
+                                                      "CVE",
+                                                      "CZK",
+                                                      "DJF",
+                                                      "DKK",
+                                                      "DOP",
+                                                      "DZD",
+                                                      "EGP",
+                                                      "ERN",
+                                                      "ETB",
+                                                      "EUR",
+                                                      "FJD",
+                                                      "FKP",
+                                                      "GBP",
+                                                      "GEL",
+                                                      "GGP",
+                                                      "GHS",
+                                                      "GIP",
+                                                      "GMD",
+                                                      "GNF",
+                                                      "GTQ",
+                                                      "GYD",
+                                                      "HKD",
+                                                      "HNL",
+                                                      "HRK",
+                                                      "HTG",
+                                                      "HUF",
+                                                      "IDR",
+                                                      "ILS",
+                                                      "IMP",
+                                                      "INR",
+                                                      "IQD",
+                                                      "IRR",
+                                                      "ISK",
+                                                      "JEP",
+                                                      "JMD",
+                                                      "JOD",
+                                                      "JPY",
+                                                      "KES",
+                                                      "KGS",
+                                                      "KHR",
+                                                      "KMF",
+                                                      "KPW",
+                                                      "KRW",
+                                                      "KWD",
+                                                      "KYD",
+                                                      "KZT",
+                                                      "LAK",
+                                                      "LBP",
+                                                      "LKR",
+                                                      "LRD",
+                                                      "LSL",
+                                                      "LYD",
+                                                      "MAD",
+                                                      "MDL",
+                                                      "MGA",
+                                                      "MKD",
+                                                      "MMK",
+                                                      "MNT",
+                                                      "MOP",
+                                                      "MRO",
+                                                      "MUR",
+                                                      "MVR",
+                                                      "MWK",
+                                                      "MXN",
+                                                      "MYR",
+                                                      "MZN",
+                                                      "NAD",
+                                                      "NGN",
+                                                      "NIO",
+                                                      "NOK",
+                                                      "NPR",
+                                                      "NZD",
+                                                      "OMR",
+                                                      "PAB",
+                                                      "PEN",
+                                                      "PGK",
+                                                      "PHP",
+                                                      "PKR",
+                                                      "PLN",
+                                                      "PYG",
+                                                      "QAR",
+                                                      "RON",
+                                                      "RSD",
+                                                      "RUB",
+                                                      "RWF",
+                                                      "SAR",
+                                                      "SBD",
+                                                      "SCR",
+                                                      "SDG",
+                                                      "SEK",
+                                                      "SGD",
+                                                      "SHP",
+                                                      "SLL",
+                                                      "SOS",
+                                                      "SPL",
+                                                      "SRD",
+                                                      "STD",
+                                                      "SVC",
+                                                      "SYP",
+                                                      "SZL",
+                                                      "THB",
+                                                      "TJS",
+                                                      "TMT",
+                                                      "TND",
+                                                      "TOP",
+                                                      "TRY",
+                                                      "TTD",
+                                                      "TVD",
+                                                      "TWD",
+                                                      "TZS",
+                                                      "UAH",
+                                                      "UGX",
+                                                      "USD",
+                                                      "UYU",
+                                                      "UZS",
+                                                      "VEF",
+                                                      "VND",
+                                                      "VUV",
+                                                      "WST",
+                                                      "XAF",
+                                                      "XCD",
+                                                      "XDR",
+                                                      "XOF",
+                                                      "XPF",
+                                                      "XTS",
+                                                      "XXX",
+                                                      "YER",
+                                                      "ZAR",
+                                                      "ZMW",
+                                                      "ZWD"
+                                                    ]
                                                   },
                                                   {
                                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -129723,9 +156188,176 @@
                                                   {
                                                     "title": "ActiveOrHistoricCurrencyCode",
                                                     "type": "string",
-                                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                    "pattern": "^[A-Z]{3,3}$",
-                                                    "example": "USD"
+                                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                    "example": "USD",
+                                                    "minLength": 3,
+                                                    "maxLength": 3,
+                                                    "enum": [
+                                                      "AED",
+                                                      "AFN",
+                                                      "ALL",
+                                                      "AMD",
+                                                      "ANG",
+                                                      "AOA",
+                                                      "ARS",
+                                                      "AUD",
+                                                      "AWG",
+                                                      "AZN",
+                                                      "BAM",
+                                                      "BBD",
+                                                      "BDT",
+                                                      "BGN",
+                                                      "BHD",
+                                                      "BIF",
+                                                      "BMD",
+                                                      "BND",
+                                                      "BOB",
+                                                      "BRL",
+                                                      "BSD",
+                                                      "BTN",
+                                                      "BWP",
+                                                      "BYN",
+                                                      "BZD",
+                                                      "CAD",
+                                                      "CDF",
+                                                      "CHF",
+                                                      "CLP",
+                                                      "CNY",
+                                                      "COP",
+                                                      "CRC",
+                                                      "CUC",
+                                                      "CUP",
+                                                      "CVE",
+                                                      "CZK",
+                                                      "DJF",
+                                                      "DKK",
+                                                      "DOP",
+                                                      "DZD",
+                                                      "EGP",
+                                                      "ERN",
+                                                      "ETB",
+                                                      "EUR",
+                                                      "FJD",
+                                                      "FKP",
+                                                      "GBP",
+                                                      "GEL",
+                                                      "GGP",
+                                                      "GHS",
+                                                      "GIP",
+                                                      "GMD",
+                                                      "GNF",
+                                                      "GTQ",
+                                                      "GYD",
+                                                      "HKD",
+                                                      "HNL",
+                                                      "HRK",
+                                                      "HTG",
+                                                      "HUF",
+                                                      "IDR",
+                                                      "ILS",
+                                                      "IMP",
+                                                      "INR",
+                                                      "IQD",
+                                                      "IRR",
+                                                      "ISK",
+                                                      "JEP",
+                                                      "JMD",
+                                                      "JOD",
+                                                      "JPY",
+                                                      "KES",
+                                                      "KGS",
+                                                      "KHR",
+                                                      "KMF",
+                                                      "KPW",
+                                                      "KRW",
+                                                      "KWD",
+                                                      "KYD",
+                                                      "KZT",
+                                                      "LAK",
+                                                      "LBP",
+                                                      "LKR",
+                                                      "LRD",
+                                                      "LSL",
+                                                      "LYD",
+                                                      "MAD",
+                                                      "MDL",
+                                                      "MGA",
+                                                      "MKD",
+                                                      "MMK",
+                                                      "MNT",
+                                                      "MOP",
+                                                      "MRO",
+                                                      "MUR",
+                                                      "MVR",
+                                                      "MWK",
+                                                      "MXN",
+                                                      "MYR",
+                                                      "MZN",
+                                                      "NAD",
+                                                      "NGN",
+                                                      "NIO",
+                                                      "NOK",
+                                                      "NPR",
+                                                      "NZD",
+                                                      "OMR",
+                                                      "PAB",
+                                                      "PEN",
+                                                      "PGK",
+                                                      "PHP",
+                                                      "PKR",
+                                                      "PLN",
+                                                      "PYG",
+                                                      "QAR",
+                                                      "RON",
+                                                      "RSD",
+                                                      "RUB",
+                                                      "RWF",
+                                                      "SAR",
+                                                      "SBD",
+                                                      "SCR",
+                                                      "SDG",
+                                                      "SEK",
+                                                      "SGD",
+                                                      "SHP",
+                                                      "SLL",
+                                                      "SOS",
+                                                      "SPL",
+                                                      "SRD",
+                                                      "STD",
+                                                      "SVC",
+                                                      "SYP",
+                                                      "SZL",
+                                                      "THB",
+                                                      "TJS",
+                                                      "TMT",
+                                                      "TND",
+                                                      "TOP",
+                                                      "TRY",
+                                                      "TTD",
+                                                      "TVD",
+                                                      "TWD",
+                                                      "TZS",
+                                                      "UAH",
+                                                      "UGX",
+                                                      "USD",
+                                                      "UYU",
+                                                      "UZS",
+                                                      "VEF",
+                                                      "VND",
+                                                      "VUV",
+                                                      "WST",
+                                                      "XAF",
+                                                      "XCD",
+                                                      "XDR",
+                                                      "XOF",
+                                                      "XPF",
+                                                      "XTS",
+                                                      "XXX",
+                                                      "YER",
+                                                      "ZAR",
+                                                      "ZMW",
+                                                      "ZWD"
+                                                    ]
                                                   },
                                                   {
                                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -129899,9 +156531,176 @@
                                                           {
                                                             "title": "ActiveOrHistoricCurrencyCode",
                                                             "type": "string",
-                                                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                            "pattern": "^[A-Z]{3,3}$",
-                                                            "example": "USD"
+                                                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                            "example": "USD",
+                                                            "minLength": 3,
+                                                            "maxLength": 3,
+                                                            "enum": [
+                                                              "AED",
+                                                              "AFN",
+                                                              "ALL",
+                                                              "AMD",
+                                                              "ANG",
+                                                              "AOA",
+                                                              "ARS",
+                                                              "AUD",
+                                                              "AWG",
+                                                              "AZN",
+                                                              "BAM",
+                                                              "BBD",
+                                                              "BDT",
+                                                              "BGN",
+                                                              "BHD",
+                                                              "BIF",
+                                                              "BMD",
+                                                              "BND",
+                                                              "BOB",
+                                                              "BRL",
+                                                              "BSD",
+                                                              "BTN",
+                                                              "BWP",
+                                                              "BYN",
+                                                              "BZD",
+                                                              "CAD",
+                                                              "CDF",
+                                                              "CHF",
+                                                              "CLP",
+                                                              "CNY",
+                                                              "COP",
+                                                              "CRC",
+                                                              "CUC",
+                                                              "CUP",
+                                                              "CVE",
+                                                              "CZK",
+                                                              "DJF",
+                                                              "DKK",
+                                                              "DOP",
+                                                              "DZD",
+                                                              "EGP",
+                                                              "ERN",
+                                                              "ETB",
+                                                              "EUR",
+                                                              "FJD",
+                                                              "FKP",
+                                                              "GBP",
+                                                              "GEL",
+                                                              "GGP",
+                                                              "GHS",
+                                                              "GIP",
+                                                              "GMD",
+                                                              "GNF",
+                                                              "GTQ",
+                                                              "GYD",
+                                                              "HKD",
+                                                              "HNL",
+                                                              "HRK",
+                                                              "HTG",
+                                                              "HUF",
+                                                              "IDR",
+                                                              "ILS",
+                                                              "IMP",
+                                                              "INR",
+                                                              "IQD",
+                                                              "IRR",
+                                                              "ISK",
+                                                              "JEP",
+                                                              "JMD",
+                                                              "JOD",
+                                                              "JPY",
+                                                              "KES",
+                                                              "KGS",
+                                                              "KHR",
+                                                              "KMF",
+                                                              "KPW",
+                                                              "KRW",
+                                                              "KWD",
+                                                              "KYD",
+                                                              "KZT",
+                                                              "LAK",
+                                                              "LBP",
+                                                              "LKR",
+                                                              "LRD",
+                                                              "LSL",
+                                                              "LYD",
+                                                              "MAD",
+                                                              "MDL",
+                                                              "MGA",
+                                                              "MKD",
+                                                              "MMK",
+                                                              "MNT",
+                                                              "MOP",
+                                                              "MRO",
+                                                              "MUR",
+                                                              "MVR",
+                                                              "MWK",
+                                                              "MXN",
+                                                              "MYR",
+                                                              "MZN",
+                                                              "NAD",
+                                                              "NGN",
+                                                              "NIO",
+                                                              "NOK",
+                                                              "NPR",
+                                                              "NZD",
+                                                              "OMR",
+                                                              "PAB",
+                                                              "PEN",
+                                                              "PGK",
+                                                              "PHP",
+                                                              "PKR",
+                                                              "PLN",
+                                                              "PYG",
+                                                              "QAR",
+                                                              "RON",
+                                                              "RSD",
+                                                              "RUB",
+                                                              "RWF",
+                                                              "SAR",
+                                                              "SBD",
+                                                              "SCR",
+                                                              "SDG",
+                                                              "SEK",
+                                                              "SGD",
+                                                              "SHP",
+                                                              "SLL",
+                                                              "SOS",
+                                                              "SPL",
+                                                              "SRD",
+                                                              "STD",
+                                                              "SVC",
+                                                              "SYP",
+                                                              "SZL",
+                                                              "THB",
+                                                              "TJS",
+                                                              "TMT",
+                                                              "TND",
+                                                              "TOP",
+                                                              "TRY",
+                                                              "TTD",
+                                                              "TVD",
+                                                              "TWD",
+                                                              "TZS",
+                                                              "UAH",
+                                                              "UGX",
+                                                              "USD",
+                                                              "UYU",
+                                                              "UZS",
+                                                              "VEF",
+                                                              "VND",
+                                                              "VUV",
+                                                              "WST",
+                                                              "XAF",
+                                                              "XCD",
+                                                              "XDR",
+                                                              "XOF",
+                                                              "XPF",
+                                                              "XTS",
+                                                              "XXX",
+                                                              "YER",
+                                                              "ZAR",
+                                                              "ZMW",
+                                                              "ZWD"
+                                                            ]
                                                           },
                                                           {
                                                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -130092,9 +156891,176 @@
                                                             {
                                                               "title": "ActiveOrHistoricCurrencyCode",
                                                               "type": "string",
-                                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                              "pattern": "^[A-Z]{3,3}$",
-                                                              "example": "USD"
+                                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                              "example": "USD",
+                                                              "minLength": 3,
+                                                              "maxLength": 3,
+                                                              "enum": [
+                                                                "AED",
+                                                                "AFN",
+                                                                "ALL",
+                                                                "AMD",
+                                                                "ANG",
+                                                                "AOA",
+                                                                "ARS",
+                                                                "AUD",
+                                                                "AWG",
+                                                                "AZN",
+                                                                "BAM",
+                                                                "BBD",
+                                                                "BDT",
+                                                                "BGN",
+                                                                "BHD",
+                                                                "BIF",
+                                                                "BMD",
+                                                                "BND",
+                                                                "BOB",
+                                                                "BRL",
+                                                                "BSD",
+                                                                "BTN",
+                                                                "BWP",
+                                                                "BYN",
+                                                                "BZD",
+                                                                "CAD",
+                                                                "CDF",
+                                                                "CHF",
+                                                                "CLP",
+                                                                "CNY",
+                                                                "COP",
+                                                                "CRC",
+                                                                "CUC",
+                                                                "CUP",
+                                                                "CVE",
+                                                                "CZK",
+                                                                "DJF",
+                                                                "DKK",
+                                                                "DOP",
+                                                                "DZD",
+                                                                "EGP",
+                                                                "ERN",
+                                                                "ETB",
+                                                                "EUR",
+                                                                "FJD",
+                                                                "FKP",
+                                                                "GBP",
+                                                                "GEL",
+                                                                "GGP",
+                                                                "GHS",
+                                                                "GIP",
+                                                                "GMD",
+                                                                "GNF",
+                                                                "GTQ",
+                                                                "GYD",
+                                                                "HKD",
+                                                                "HNL",
+                                                                "HRK",
+                                                                "HTG",
+                                                                "HUF",
+                                                                "IDR",
+                                                                "ILS",
+                                                                "IMP",
+                                                                "INR",
+                                                                "IQD",
+                                                                "IRR",
+                                                                "ISK",
+                                                                "JEP",
+                                                                "JMD",
+                                                                "JOD",
+                                                                "JPY",
+                                                                "KES",
+                                                                "KGS",
+                                                                "KHR",
+                                                                "KMF",
+                                                                "KPW",
+                                                                "KRW",
+                                                                "KWD",
+                                                                "KYD",
+                                                                "KZT",
+                                                                "LAK",
+                                                                "LBP",
+                                                                "LKR",
+                                                                "LRD",
+                                                                "LSL",
+                                                                "LYD",
+                                                                "MAD",
+                                                                "MDL",
+                                                                "MGA",
+                                                                "MKD",
+                                                                "MMK",
+                                                                "MNT",
+                                                                "MOP",
+                                                                "MRO",
+                                                                "MUR",
+                                                                "MVR",
+                                                                "MWK",
+                                                                "MXN",
+                                                                "MYR",
+                                                                "MZN",
+                                                                "NAD",
+                                                                "NGN",
+                                                                "NIO",
+                                                                "NOK",
+                                                                "NPR",
+                                                                "NZD",
+                                                                "OMR",
+                                                                "PAB",
+                                                                "PEN",
+                                                                "PGK",
+                                                                "PHP",
+                                                                "PKR",
+                                                                "PLN",
+                                                                "PYG",
+                                                                "QAR",
+                                                                "RON",
+                                                                "RSD",
+                                                                "RUB",
+                                                                "RWF",
+                                                                "SAR",
+                                                                "SBD",
+                                                                "SCR",
+                                                                "SDG",
+                                                                "SEK",
+                                                                "SGD",
+                                                                "SHP",
+                                                                "SLL",
+                                                                "SOS",
+                                                                "SPL",
+                                                                "SRD",
+                                                                "STD",
+                                                                "SVC",
+                                                                "SYP",
+                                                                "SZL",
+                                                                "THB",
+                                                                "TJS",
+                                                                "TMT",
+                                                                "TND",
+                                                                "TOP",
+                                                                "TRY",
+                                                                "TTD",
+                                                                "TVD",
+                                                                "TWD",
+                                                                "TZS",
+                                                                "UAH",
+                                                                "UGX",
+                                                                "USD",
+                                                                "UYU",
+                                                                "UZS",
+                                                                "VEF",
+                                                                "VND",
+                                                                "VUV",
+                                                                "WST",
+                                                                "XAF",
+                                                                "XCD",
+                                                                "XDR",
+                                                                "XOF",
+                                                                "XPF",
+                                                                "XTS",
+                                                                "XXX",
+                                                                "YER",
+                                                                "ZAR",
+                                                                "ZMW",
+                                                                "ZWD"
+                                                              ]
                                                             },
                                                             {
                                                               "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -130472,9 +157438,176 @@
                                                     {
                                                       "title": "ActiveOrHistoricCurrencyCode",
                                                       "type": "string",
-                                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                      "pattern": "^[A-Z]{3,3}$",
-                                                      "example": "USD"
+                                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                      "example": "USD",
+                                                      "minLength": 3,
+                                                      "maxLength": 3,
+                                                      "enum": [
+                                                        "AED",
+                                                        "AFN",
+                                                        "ALL",
+                                                        "AMD",
+                                                        "ANG",
+                                                        "AOA",
+                                                        "ARS",
+                                                        "AUD",
+                                                        "AWG",
+                                                        "AZN",
+                                                        "BAM",
+                                                        "BBD",
+                                                        "BDT",
+                                                        "BGN",
+                                                        "BHD",
+                                                        "BIF",
+                                                        "BMD",
+                                                        "BND",
+                                                        "BOB",
+                                                        "BRL",
+                                                        "BSD",
+                                                        "BTN",
+                                                        "BWP",
+                                                        "BYN",
+                                                        "BZD",
+                                                        "CAD",
+                                                        "CDF",
+                                                        "CHF",
+                                                        "CLP",
+                                                        "CNY",
+                                                        "COP",
+                                                        "CRC",
+                                                        "CUC",
+                                                        "CUP",
+                                                        "CVE",
+                                                        "CZK",
+                                                        "DJF",
+                                                        "DKK",
+                                                        "DOP",
+                                                        "DZD",
+                                                        "EGP",
+                                                        "ERN",
+                                                        "ETB",
+                                                        "EUR",
+                                                        "FJD",
+                                                        "FKP",
+                                                        "GBP",
+                                                        "GEL",
+                                                        "GGP",
+                                                        "GHS",
+                                                        "GIP",
+                                                        "GMD",
+                                                        "GNF",
+                                                        "GTQ",
+                                                        "GYD",
+                                                        "HKD",
+                                                        "HNL",
+                                                        "HRK",
+                                                        "HTG",
+                                                        "HUF",
+                                                        "IDR",
+                                                        "ILS",
+                                                        "IMP",
+                                                        "INR",
+                                                        "IQD",
+                                                        "IRR",
+                                                        "ISK",
+                                                        "JEP",
+                                                        "JMD",
+                                                        "JOD",
+                                                        "JPY",
+                                                        "KES",
+                                                        "KGS",
+                                                        "KHR",
+                                                        "KMF",
+                                                        "KPW",
+                                                        "KRW",
+                                                        "KWD",
+                                                        "KYD",
+                                                        "KZT",
+                                                        "LAK",
+                                                        "LBP",
+                                                        "LKR",
+                                                        "LRD",
+                                                        "LSL",
+                                                        "LYD",
+                                                        "MAD",
+                                                        "MDL",
+                                                        "MGA",
+                                                        "MKD",
+                                                        "MMK",
+                                                        "MNT",
+                                                        "MOP",
+                                                        "MRO",
+                                                        "MUR",
+                                                        "MVR",
+                                                        "MWK",
+                                                        "MXN",
+                                                        "MYR",
+                                                        "MZN",
+                                                        "NAD",
+                                                        "NGN",
+                                                        "NIO",
+                                                        "NOK",
+                                                        "NPR",
+                                                        "NZD",
+                                                        "OMR",
+                                                        "PAB",
+                                                        "PEN",
+                                                        "PGK",
+                                                        "PHP",
+                                                        "PKR",
+                                                        "PLN",
+                                                        "PYG",
+                                                        "QAR",
+                                                        "RON",
+                                                        "RSD",
+                                                        "RUB",
+                                                        "RWF",
+                                                        "SAR",
+                                                        "SBD",
+                                                        "SCR",
+                                                        "SDG",
+                                                        "SEK",
+                                                        "SGD",
+                                                        "SHP",
+                                                        "SLL",
+                                                        "SOS",
+                                                        "SPL",
+                                                        "SRD",
+                                                        "STD",
+                                                        "SVC",
+                                                        "SYP",
+                                                        "SZL",
+                                                        "THB",
+                                                        "TJS",
+                                                        "TMT",
+                                                        "TND",
+                                                        "TOP",
+                                                        "TRY",
+                                                        "TTD",
+                                                        "TVD",
+                                                        "TWD",
+                                                        "TZS",
+                                                        "UAH",
+                                                        "UGX",
+                                                        "USD",
+                                                        "UYU",
+                                                        "UZS",
+                                                        "VEF",
+                                                        "VND",
+                                                        "VUV",
+                                                        "WST",
+                                                        "XAF",
+                                                        "XCD",
+                                                        "XDR",
+                                                        "XOF",
+                                                        "XPF",
+                                                        "XTS",
+                                                        "XXX",
+                                                        "YER",
+                                                        "ZAR",
+                                                        "ZMW",
+                                                        "ZWD"
+                                                      ]
                                                     },
                                                     {
                                                       "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -130521,9 +157654,176 @@
                                                     {
                                                       "title": "ActiveOrHistoricCurrencyCode",
                                                       "type": "string",
-                                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                      "pattern": "^[A-Z]{3,3}$",
-                                                      "example": "USD"
+                                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                      "example": "USD",
+                                                      "minLength": 3,
+                                                      "maxLength": 3,
+                                                      "enum": [
+                                                        "AED",
+                                                        "AFN",
+                                                        "ALL",
+                                                        "AMD",
+                                                        "ANG",
+                                                        "AOA",
+                                                        "ARS",
+                                                        "AUD",
+                                                        "AWG",
+                                                        "AZN",
+                                                        "BAM",
+                                                        "BBD",
+                                                        "BDT",
+                                                        "BGN",
+                                                        "BHD",
+                                                        "BIF",
+                                                        "BMD",
+                                                        "BND",
+                                                        "BOB",
+                                                        "BRL",
+                                                        "BSD",
+                                                        "BTN",
+                                                        "BWP",
+                                                        "BYN",
+                                                        "BZD",
+                                                        "CAD",
+                                                        "CDF",
+                                                        "CHF",
+                                                        "CLP",
+                                                        "CNY",
+                                                        "COP",
+                                                        "CRC",
+                                                        "CUC",
+                                                        "CUP",
+                                                        "CVE",
+                                                        "CZK",
+                                                        "DJF",
+                                                        "DKK",
+                                                        "DOP",
+                                                        "DZD",
+                                                        "EGP",
+                                                        "ERN",
+                                                        "ETB",
+                                                        "EUR",
+                                                        "FJD",
+                                                        "FKP",
+                                                        "GBP",
+                                                        "GEL",
+                                                        "GGP",
+                                                        "GHS",
+                                                        "GIP",
+                                                        "GMD",
+                                                        "GNF",
+                                                        "GTQ",
+                                                        "GYD",
+                                                        "HKD",
+                                                        "HNL",
+                                                        "HRK",
+                                                        "HTG",
+                                                        "HUF",
+                                                        "IDR",
+                                                        "ILS",
+                                                        "IMP",
+                                                        "INR",
+                                                        "IQD",
+                                                        "IRR",
+                                                        "ISK",
+                                                        "JEP",
+                                                        "JMD",
+                                                        "JOD",
+                                                        "JPY",
+                                                        "KES",
+                                                        "KGS",
+                                                        "KHR",
+                                                        "KMF",
+                                                        "KPW",
+                                                        "KRW",
+                                                        "KWD",
+                                                        "KYD",
+                                                        "KZT",
+                                                        "LAK",
+                                                        "LBP",
+                                                        "LKR",
+                                                        "LRD",
+                                                        "LSL",
+                                                        "LYD",
+                                                        "MAD",
+                                                        "MDL",
+                                                        "MGA",
+                                                        "MKD",
+                                                        "MMK",
+                                                        "MNT",
+                                                        "MOP",
+                                                        "MRO",
+                                                        "MUR",
+                                                        "MVR",
+                                                        "MWK",
+                                                        "MXN",
+                                                        "MYR",
+                                                        "MZN",
+                                                        "NAD",
+                                                        "NGN",
+                                                        "NIO",
+                                                        "NOK",
+                                                        "NPR",
+                                                        "NZD",
+                                                        "OMR",
+                                                        "PAB",
+                                                        "PEN",
+                                                        "PGK",
+                                                        "PHP",
+                                                        "PKR",
+                                                        "PLN",
+                                                        "PYG",
+                                                        "QAR",
+                                                        "RON",
+                                                        "RSD",
+                                                        "RUB",
+                                                        "RWF",
+                                                        "SAR",
+                                                        "SBD",
+                                                        "SCR",
+                                                        "SDG",
+                                                        "SEK",
+                                                        "SGD",
+                                                        "SHP",
+                                                        "SLL",
+                                                        "SOS",
+                                                        "SPL",
+                                                        "SRD",
+                                                        "STD",
+                                                        "SVC",
+                                                        "SYP",
+                                                        "SZL",
+                                                        "THB",
+                                                        "TJS",
+                                                        "TMT",
+                                                        "TND",
+                                                        "TOP",
+                                                        "TRY",
+                                                        "TTD",
+                                                        "TVD",
+                                                        "TWD",
+                                                        "TZS",
+                                                        "UAH",
+                                                        "UGX",
+                                                        "USD",
+                                                        "UYU",
+                                                        "UZS",
+                                                        "VEF",
+                                                        "VND",
+                                                        "VUV",
+                                                        "WST",
+                                                        "XAF",
+                                                        "XCD",
+                                                        "XDR",
+                                                        "XOF",
+                                                        "XPF",
+                                                        "XTS",
+                                                        "XXX",
+                                                        "YER",
+                                                        "ZAR",
+                                                        "ZMW",
+                                                        "ZWD"
+                                                      ]
                                                     },
                                                     {
                                                       "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -130697,9 +157997,176 @@
                                                             {
                                                               "title": "ActiveOrHistoricCurrencyCode",
                                                               "type": "string",
-                                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                              "pattern": "^[A-Z]{3,3}$",
-                                                              "example": "USD"
+                                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                              "example": "USD",
+                                                              "minLength": 3,
+                                                              "maxLength": 3,
+                                                              "enum": [
+                                                                "AED",
+                                                                "AFN",
+                                                                "ALL",
+                                                                "AMD",
+                                                                "ANG",
+                                                                "AOA",
+                                                                "ARS",
+                                                                "AUD",
+                                                                "AWG",
+                                                                "AZN",
+                                                                "BAM",
+                                                                "BBD",
+                                                                "BDT",
+                                                                "BGN",
+                                                                "BHD",
+                                                                "BIF",
+                                                                "BMD",
+                                                                "BND",
+                                                                "BOB",
+                                                                "BRL",
+                                                                "BSD",
+                                                                "BTN",
+                                                                "BWP",
+                                                                "BYN",
+                                                                "BZD",
+                                                                "CAD",
+                                                                "CDF",
+                                                                "CHF",
+                                                                "CLP",
+                                                                "CNY",
+                                                                "COP",
+                                                                "CRC",
+                                                                "CUC",
+                                                                "CUP",
+                                                                "CVE",
+                                                                "CZK",
+                                                                "DJF",
+                                                                "DKK",
+                                                                "DOP",
+                                                                "DZD",
+                                                                "EGP",
+                                                                "ERN",
+                                                                "ETB",
+                                                                "EUR",
+                                                                "FJD",
+                                                                "FKP",
+                                                                "GBP",
+                                                                "GEL",
+                                                                "GGP",
+                                                                "GHS",
+                                                                "GIP",
+                                                                "GMD",
+                                                                "GNF",
+                                                                "GTQ",
+                                                                "GYD",
+                                                                "HKD",
+                                                                "HNL",
+                                                                "HRK",
+                                                                "HTG",
+                                                                "HUF",
+                                                                "IDR",
+                                                                "ILS",
+                                                                "IMP",
+                                                                "INR",
+                                                                "IQD",
+                                                                "IRR",
+                                                                "ISK",
+                                                                "JEP",
+                                                                "JMD",
+                                                                "JOD",
+                                                                "JPY",
+                                                                "KES",
+                                                                "KGS",
+                                                                "KHR",
+                                                                "KMF",
+                                                                "KPW",
+                                                                "KRW",
+                                                                "KWD",
+                                                                "KYD",
+                                                                "KZT",
+                                                                "LAK",
+                                                                "LBP",
+                                                                "LKR",
+                                                                "LRD",
+                                                                "LSL",
+                                                                "LYD",
+                                                                "MAD",
+                                                                "MDL",
+                                                                "MGA",
+                                                                "MKD",
+                                                                "MMK",
+                                                                "MNT",
+                                                                "MOP",
+                                                                "MRO",
+                                                                "MUR",
+                                                                "MVR",
+                                                                "MWK",
+                                                                "MXN",
+                                                                "MYR",
+                                                                "MZN",
+                                                                "NAD",
+                                                                "NGN",
+                                                                "NIO",
+                                                                "NOK",
+                                                                "NPR",
+                                                                "NZD",
+                                                                "OMR",
+                                                                "PAB",
+                                                                "PEN",
+                                                                "PGK",
+                                                                "PHP",
+                                                                "PKR",
+                                                                "PLN",
+                                                                "PYG",
+                                                                "QAR",
+                                                                "RON",
+                                                                "RSD",
+                                                                "RUB",
+                                                                "RWF",
+                                                                "SAR",
+                                                                "SBD",
+                                                                "SCR",
+                                                                "SDG",
+                                                                "SEK",
+                                                                "SGD",
+                                                                "SHP",
+                                                                "SLL",
+                                                                "SOS",
+                                                                "SPL",
+                                                                "SRD",
+                                                                "STD",
+                                                                "SVC",
+                                                                "SYP",
+                                                                "SZL",
+                                                                "THB",
+                                                                "TJS",
+                                                                "TMT",
+                                                                "TND",
+                                                                "TOP",
+                                                                "TRY",
+                                                                "TTD",
+                                                                "TVD",
+                                                                "TWD",
+                                                                "TZS",
+                                                                "UAH",
+                                                                "UGX",
+                                                                "USD",
+                                                                "UYU",
+                                                                "UZS",
+                                                                "VEF",
+                                                                "VND",
+                                                                "VUV",
+                                                                "WST",
+                                                                "XAF",
+                                                                "XCD",
+                                                                "XDR",
+                                                                "XOF",
+                                                                "XPF",
+                                                                "XTS",
+                                                                "XXX",
+                                                                "YER",
+                                                                "ZAR",
+                                                                "ZMW",
+                                                                "ZWD"
+                                                              ]
                                                             },
                                                             {
                                                               "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -130890,9 +158357,176 @@
                                                               {
                                                                 "title": "ActiveOrHistoricCurrencyCode",
                                                                 "type": "string",
-                                                                "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                                "pattern": "^[A-Z]{3,3}$",
-                                                                "example": "USD"
+                                                                "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                                "example": "USD",
+                                                                "minLength": 3,
+                                                                "maxLength": 3,
+                                                                "enum": [
+                                                                  "AED",
+                                                                  "AFN",
+                                                                  "ALL",
+                                                                  "AMD",
+                                                                  "ANG",
+                                                                  "AOA",
+                                                                  "ARS",
+                                                                  "AUD",
+                                                                  "AWG",
+                                                                  "AZN",
+                                                                  "BAM",
+                                                                  "BBD",
+                                                                  "BDT",
+                                                                  "BGN",
+                                                                  "BHD",
+                                                                  "BIF",
+                                                                  "BMD",
+                                                                  "BND",
+                                                                  "BOB",
+                                                                  "BRL",
+                                                                  "BSD",
+                                                                  "BTN",
+                                                                  "BWP",
+                                                                  "BYN",
+                                                                  "BZD",
+                                                                  "CAD",
+                                                                  "CDF",
+                                                                  "CHF",
+                                                                  "CLP",
+                                                                  "CNY",
+                                                                  "COP",
+                                                                  "CRC",
+                                                                  "CUC",
+                                                                  "CUP",
+                                                                  "CVE",
+                                                                  "CZK",
+                                                                  "DJF",
+                                                                  "DKK",
+                                                                  "DOP",
+                                                                  "DZD",
+                                                                  "EGP",
+                                                                  "ERN",
+                                                                  "ETB",
+                                                                  "EUR",
+                                                                  "FJD",
+                                                                  "FKP",
+                                                                  "GBP",
+                                                                  "GEL",
+                                                                  "GGP",
+                                                                  "GHS",
+                                                                  "GIP",
+                                                                  "GMD",
+                                                                  "GNF",
+                                                                  "GTQ",
+                                                                  "GYD",
+                                                                  "HKD",
+                                                                  "HNL",
+                                                                  "HRK",
+                                                                  "HTG",
+                                                                  "HUF",
+                                                                  "IDR",
+                                                                  "ILS",
+                                                                  "IMP",
+                                                                  "INR",
+                                                                  "IQD",
+                                                                  "IRR",
+                                                                  "ISK",
+                                                                  "JEP",
+                                                                  "JMD",
+                                                                  "JOD",
+                                                                  "JPY",
+                                                                  "KES",
+                                                                  "KGS",
+                                                                  "KHR",
+                                                                  "KMF",
+                                                                  "KPW",
+                                                                  "KRW",
+                                                                  "KWD",
+                                                                  "KYD",
+                                                                  "KZT",
+                                                                  "LAK",
+                                                                  "LBP",
+                                                                  "LKR",
+                                                                  "LRD",
+                                                                  "LSL",
+                                                                  "LYD",
+                                                                  "MAD",
+                                                                  "MDL",
+                                                                  "MGA",
+                                                                  "MKD",
+                                                                  "MMK",
+                                                                  "MNT",
+                                                                  "MOP",
+                                                                  "MRO",
+                                                                  "MUR",
+                                                                  "MVR",
+                                                                  "MWK",
+                                                                  "MXN",
+                                                                  "MYR",
+                                                                  "MZN",
+                                                                  "NAD",
+                                                                  "NGN",
+                                                                  "NIO",
+                                                                  "NOK",
+                                                                  "NPR",
+                                                                  "NZD",
+                                                                  "OMR",
+                                                                  "PAB",
+                                                                  "PEN",
+                                                                  "PGK",
+                                                                  "PHP",
+                                                                  "PKR",
+                                                                  "PLN",
+                                                                  "PYG",
+                                                                  "QAR",
+                                                                  "RON",
+                                                                  "RSD",
+                                                                  "RUB",
+                                                                  "RWF",
+                                                                  "SAR",
+                                                                  "SBD",
+                                                                  "SCR",
+                                                                  "SDG",
+                                                                  "SEK",
+                                                                  "SGD",
+                                                                  "SHP",
+                                                                  "SLL",
+                                                                  "SOS",
+                                                                  "SPL",
+                                                                  "SRD",
+                                                                  "STD",
+                                                                  "SVC",
+                                                                  "SYP",
+                                                                  "SZL",
+                                                                  "THB",
+                                                                  "TJS",
+                                                                  "TMT",
+                                                                  "TND",
+                                                                  "TOP",
+                                                                  "TRY",
+                                                                  "TTD",
+                                                                  "TVD",
+                                                                  "TWD",
+                                                                  "TZS",
+                                                                  "UAH",
+                                                                  "UGX",
+                                                                  "USD",
+                                                                  "UYU",
+                                                                  "UZS",
+                                                                  "VEF",
+                                                                  "VND",
+                                                                  "VUV",
+                                                                  "WST",
+                                                                  "XAF",
+                                                                  "XCD",
+                                                                  "XDR",
+                                                                  "XOF",
+                                                                  "XPF",
+                                                                  "XTS",
+                                                                  "XXX",
+                                                                  "YER",
+                                                                  "ZAR",
+                                                                  "ZMW",
+                                                                  "ZWD"
+                                                                ]
                                                               },
                                                               {
                                                                 "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -131089,9 +158723,10 @@
                         "allOf": [
                           {
                             "title": "Exact32HexBinaryText",
-                            "description": "Specifies a hexadecimal string with a length of 32 characters.\n",
+                            "description": "Specifies a hexadecimal string.\n\nNOTE: This pattern is not the original ISO20022 specification.\n",
                             "type": "string",
-                            "example": "1234567890ABCDEF1234567890ABCDEF"
+                            "pattern": "^[A-Za-z0-9-_]{43}$",
+                            "maxLength": 48
                           },
                           {
                             "description": "SHA-256 signature of the terms\n"
@@ -131674,45 +159309,39 @@
                       "InstrId": {
                         "allOf": [
                           {
-                            "title": "Max35Text",
-                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "title": "ULIDIdentifier",
                             "type": "string",
-                            "minLength": 1,
-                            "maxLength": 35,
-                            "example": 1.234567890123457e+34
+                            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                            "example": "01AN4Z07BY79KA1307SR9X4MV3"
                           },
                           {
-                            "description": "InstructionIdentification (FSPIOP equivalent: transactionRequestId)\n\nDefinition: Unique identification, as assigned by an instructing party for an instructed party, to\nunambiguously identify the instruction.\n\nUsage: The instruction identification is a point to point reference that can be used between the\ninstructing party and the instructed party to refer to the individual instruction. It can be included in\nseveral messages related to the instruction.\n"
+                            "description": "InstructionIdentification (FSPIOP equivalent: transactionRequestId)\n\nDefinition: Unique identification, as assigned by an instructing party for an instructed party, to\nunambiguously identify the instruction.\n\nUsage: The instruction identification is a point to point reference that can be used between the\ninstructing party and the instructed party to refer to the individual instruction. It can be included in\nseveral messages related to the instruction.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                           }
                         ]
                       },
                       "EndToEndId": {
                         "allOf": [
                           {
-                            "title": "Max35Text",
-                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "title": "ULIDIdentifier",
                             "type": "string",
-                            "minLength": 1,
-                            "maxLength": 35,
-                            "example": 1.234567890123457e+34
+                            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                            "example": "01AN4Z07BY79KA1307SR9X4MV3"
                           },
                           {
-                            "description": "EndToEndIdentification (FSPIOP equivalent: transactionId)\n\nDefinition: Unique identification, as assigned by the initiating party, to unambiguously identify the\ntransaction. This identification is passed on, unchanged, throughout the entire end-to-end chain.\n\nUsage: The end-to-end identification can be used for reconciliation or to link tasks relating to the\ntransaction. It can be included in several messages related to the transaction.\n\nUsage: In case there are technical limitations to pass on multiple references, the end-to-end\nidentification must be passed on throughout the entire end-to-end chain.\n"
+                            "description": "EndToEndIdentification (FSPIOP equivalent: transactionId)\n\nDefinition: Unique identification, as assigned by the initiating party, to unambiguously identify the\ntransaction. This identification is passed on, unchanged, throughout the entire end-to-end chain.\n\nUsage: The end-to-end identification can be used for reconciliation or to link tasks relating to the\ntransaction. It can be included in several messages related to the transaction.\n\nUsage: In case there are technical limitations to pass on multiple references, the end-to-end\nidentification must be passed on throughout the entire end-to-end chain.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                           }
                         ]
                       },
                       "TxId": {
                         "allOf": [
                           {
-                            "title": "Max35Text",
-                            "description": "Specifies a character string with a maximum length of 35 characters.\n",
+                            "title": "ULIDIdentifier",
                             "type": "string",
-                            "minLength": 1,
-                            "maxLength": 35,
-                            "example": 1.234567890123457e+34
+                            "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+                            "example": "01AN4Z07BY79KA1307SR9X4MV3"
                           },
                           {
-                            "description": "TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)\n\nDefinition: Unique identification, as assigned by the first instructing agent, to unambiguously identify the\ntransaction that is passed on, unchanged, throughout the entire interbank chain.\n\nUsage: The transaction identification can be used for reconciliation, tracking or to link tasks relating to\nthe transaction on the interbank level.\n\nUsage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.\n"
+                            "description": "TransactionIdentification (FSPIOP equivalent: quoteId in quote request, transferId in transfer request)\n\nDefinition: Unique identification, as assigned by the first instructing agent, to unambiguously identify the\ntransaction that is passed on, unchanged, throughout the entire interbank chain.\n\nUsage: The transaction identification can be used for reconciliation, tracking or to link tasks relating to\nthe transaction on the interbank level.\n\nUsage: The instructing agent has to make sure that the transaction identification is unique for a preagreed period.\n\nThis field has been changed from the original ISO20022 `Max35Text`` schema to a ULIDIdentifier schema.\n"
                           }
                         ]
                       },
@@ -132023,9 +159652,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -136078,9 +163874,176 @@
                           {
                             "title": "ActiveCurrencyCode",
                             "type": "string",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -136127,9 +164090,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -136208,9 +164338,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -138588,9 +166885,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -141913,9 +170377,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -142378,9 +171009,176 @@
                                           {
                                             "title": "ActiveOrHistoricCurrencyCode",
                                             "type": "string",
-                                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                            "pattern": "^[A-Z]{3,3}$",
-                                            "example": "USD"
+                                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                            "example": "USD",
+                                            "minLength": 3,
+                                            "maxLength": 3,
+                                            "enum": [
+                                              "AED",
+                                              "AFN",
+                                              "ALL",
+                                              "AMD",
+                                              "ANG",
+                                              "AOA",
+                                              "ARS",
+                                              "AUD",
+                                              "AWG",
+                                              "AZN",
+                                              "BAM",
+                                              "BBD",
+                                              "BDT",
+                                              "BGN",
+                                              "BHD",
+                                              "BIF",
+                                              "BMD",
+                                              "BND",
+                                              "BOB",
+                                              "BRL",
+                                              "BSD",
+                                              "BTN",
+                                              "BWP",
+                                              "BYN",
+                                              "BZD",
+                                              "CAD",
+                                              "CDF",
+                                              "CHF",
+                                              "CLP",
+                                              "CNY",
+                                              "COP",
+                                              "CRC",
+                                              "CUC",
+                                              "CUP",
+                                              "CVE",
+                                              "CZK",
+                                              "DJF",
+                                              "DKK",
+                                              "DOP",
+                                              "DZD",
+                                              "EGP",
+                                              "ERN",
+                                              "ETB",
+                                              "EUR",
+                                              "FJD",
+                                              "FKP",
+                                              "GBP",
+                                              "GEL",
+                                              "GGP",
+                                              "GHS",
+                                              "GIP",
+                                              "GMD",
+                                              "GNF",
+                                              "GTQ",
+                                              "GYD",
+                                              "HKD",
+                                              "HNL",
+                                              "HRK",
+                                              "HTG",
+                                              "HUF",
+                                              "IDR",
+                                              "ILS",
+                                              "IMP",
+                                              "INR",
+                                              "IQD",
+                                              "IRR",
+                                              "ISK",
+                                              "JEP",
+                                              "JMD",
+                                              "JOD",
+                                              "JPY",
+                                              "KES",
+                                              "KGS",
+                                              "KHR",
+                                              "KMF",
+                                              "KPW",
+                                              "KRW",
+                                              "KWD",
+                                              "KYD",
+                                              "KZT",
+                                              "LAK",
+                                              "LBP",
+                                              "LKR",
+                                              "LRD",
+                                              "LSL",
+                                              "LYD",
+                                              "MAD",
+                                              "MDL",
+                                              "MGA",
+                                              "MKD",
+                                              "MMK",
+                                              "MNT",
+                                              "MOP",
+                                              "MRO",
+                                              "MUR",
+                                              "MVR",
+                                              "MWK",
+                                              "MXN",
+                                              "MYR",
+                                              "MZN",
+                                              "NAD",
+                                              "NGN",
+                                              "NIO",
+                                              "NOK",
+                                              "NPR",
+                                              "NZD",
+                                              "OMR",
+                                              "PAB",
+                                              "PEN",
+                                              "PGK",
+                                              "PHP",
+                                              "PKR",
+                                              "PLN",
+                                              "PYG",
+                                              "QAR",
+                                              "RON",
+                                              "RSD",
+                                              "RUB",
+                                              "RWF",
+                                              "SAR",
+                                              "SBD",
+                                              "SCR",
+                                              "SDG",
+                                              "SEK",
+                                              "SGD",
+                                              "SHP",
+                                              "SLL",
+                                              "SOS",
+                                              "SPL",
+                                              "SRD",
+                                              "STD",
+                                              "SVC",
+                                              "SYP",
+                                              "SZL",
+                                              "THB",
+                                              "TJS",
+                                              "TMT",
+                                              "TND",
+                                              "TOP",
+                                              "TRY",
+                                              "TTD",
+                                              "TVD",
+                                              "TWD",
+                                              "TZS",
+                                              "UAH",
+                                              "UGX",
+                                              "USD",
+                                              "UYU",
+                                              "UZS",
+                                              "VEF",
+                                              "VND",
+                                              "VUV",
+                                              "WST",
+                                              "XAF",
+                                              "XCD",
+                                              "XDR",
+                                              "XOF",
+                                              "XPF",
+                                              "XTS",
+                                              "XXX",
+                                              "YER",
+                                              "ZAR",
+                                              "ZMW",
+                                              "ZWD"
+                                            ]
                                           },
                                           {
                                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -142528,9 +171326,176 @@
                                             {
                                               "title": "ActiveOrHistoricCurrencyCode",
                                               "type": "string",
-                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                              "pattern": "^[A-Z]{3,3}$",
-                                              "example": "USD"
+                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                              "example": "USD",
+                                              "minLength": 3,
+                                              "maxLength": 3,
+                                              "enum": [
+                                                "AED",
+                                                "AFN",
+                                                "ALL",
+                                                "AMD",
+                                                "ANG",
+                                                "AOA",
+                                                "ARS",
+                                                "AUD",
+                                                "AWG",
+                                                "AZN",
+                                                "BAM",
+                                                "BBD",
+                                                "BDT",
+                                                "BGN",
+                                                "BHD",
+                                                "BIF",
+                                                "BMD",
+                                                "BND",
+                                                "BOB",
+                                                "BRL",
+                                                "BSD",
+                                                "BTN",
+                                                "BWP",
+                                                "BYN",
+                                                "BZD",
+                                                "CAD",
+                                                "CDF",
+                                                "CHF",
+                                                "CLP",
+                                                "CNY",
+                                                "COP",
+                                                "CRC",
+                                                "CUC",
+                                                "CUP",
+                                                "CVE",
+                                                "CZK",
+                                                "DJF",
+                                                "DKK",
+                                                "DOP",
+                                                "DZD",
+                                                "EGP",
+                                                "ERN",
+                                                "ETB",
+                                                "EUR",
+                                                "FJD",
+                                                "FKP",
+                                                "GBP",
+                                                "GEL",
+                                                "GGP",
+                                                "GHS",
+                                                "GIP",
+                                                "GMD",
+                                                "GNF",
+                                                "GTQ",
+                                                "GYD",
+                                                "HKD",
+                                                "HNL",
+                                                "HRK",
+                                                "HTG",
+                                                "HUF",
+                                                "IDR",
+                                                "ILS",
+                                                "IMP",
+                                                "INR",
+                                                "IQD",
+                                                "IRR",
+                                                "ISK",
+                                                "JEP",
+                                                "JMD",
+                                                "JOD",
+                                                "JPY",
+                                                "KES",
+                                                "KGS",
+                                                "KHR",
+                                                "KMF",
+                                                "KPW",
+                                                "KRW",
+                                                "KWD",
+                                                "KYD",
+                                                "KZT",
+                                                "LAK",
+                                                "LBP",
+                                                "LKR",
+                                                "LRD",
+                                                "LSL",
+                                                "LYD",
+                                                "MAD",
+                                                "MDL",
+                                                "MGA",
+                                                "MKD",
+                                                "MMK",
+                                                "MNT",
+                                                "MOP",
+                                                "MRO",
+                                                "MUR",
+                                                "MVR",
+                                                "MWK",
+                                                "MXN",
+                                                "MYR",
+                                                "MZN",
+                                                "NAD",
+                                                "NGN",
+                                                "NIO",
+                                                "NOK",
+                                                "NPR",
+                                                "NZD",
+                                                "OMR",
+                                                "PAB",
+                                                "PEN",
+                                                "PGK",
+                                                "PHP",
+                                                "PKR",
+                                                "PLN",
+                                                "PYG",
+                                                "QAR",
+                                                "RON",
+                                                "RSD",
+                                                "RUB",
+                                                "RWF",
+                                                "SAR",
+                                                "SBD",
+                                                "SCR",
+                                                "SDG",
+                                                "SEK",
+                                                "SGD",
+                                                "SHP",
+                                                "SLL",
+                                                "SOS",
+                                                "SPL",
+                                                "SRD",
+                                                "STD",
+                                                "SVC",
+                                                "SYP",
+                                                "SZL",
+                                                "THB",
+                                                "TJS",
+                                                "TMT",
+                                                "TND",
+                                                "TOP",
+                                                "TRY",
+                                                "TTD",
+                                                "TVD",
+                                                "TWD",
+                                                "TZS",
+                                                "UAH",
+                                                "UGX",
+                                                "USD",
+                                                "UYU",
+                                                "UZS",
+                                                "VEF",
+                                                "VND",
+                                                "VUV",
+                                                "WST",
+                                                "XAF",
+                                                "XCD",
+                                                "XDR",
+                                                "XOF",
+                                                "XPF",
+                                                "XTS",
+                                                "XXX",
+                                                "YER",
+                                                "ZAR",
+                                                "ZMW",
+                                                "ZWD"
+                                              ]
                                             },
                                             {
                                               "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -142984,9 +171949,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -143033,9 +172165,176 @@
                                   {
                                     "title": "ActiveOrHistoricCurrencyCode",
                                     "type": "string",
-                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                    "pattern": "^[A-Z]{3,3}$",
-                                    "example": "USD"
+                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                    "example": "USD",
+                                    "minLength": 3,
+                                    "maxLength": 3,
+                                    "enum": [
+                                      "AED",
+                                      "AFN",
+                                      "ALL",
+                                      "AMD",
+                                      "ANG",
+                                      "AOA",
+                                      "ARS",
+                                      "AUD",
+                                      "AWG",
+                                      "AZN",
+                                      "BAM",
+                                      "BBD",
+                                      "BDT",
+                                      "BGN",
+                                      "BHD",
+                                      "BIF",
+                                      "BMD",
+                                      "BND",
+                                      "BOB",
+                                      "BRL",
+                                      "BSD",
+                                      "BTN",
+                                      "BWP",
+                                      "BYN",
+                                      "BZD",
+                                      "CAD",
+                                      "CDF",
+                                      "CHF",
+                                      "CLP",
+                                      "CNY",
+                                      "COP",
+                                      "CRC",
+                                      "CUC",
+                                      "CUP",
+                                      "CVE",
+                                      "CZK",
+                                      "DJF",
+                                      "DKK",
+                                      "DOP",
+                                      "DZD",
+                                      "EGP",
+                                      "ERN",
+                                      "ETB",
+                                      "EUR",
+                                      "FJD",
+                                      "FKP",
+                                      "GBP",
+                                      "GEL",
+                                      "GGP",
+                                      "GHS",
+                                      "GIP",
+                                      "GMD",
+                                      "GNF",
+                                      "GTQ",
+                                      "GYD",
+                                      "HKD",
+                                      "HNL",
+                                      "HRK",
+                                      "HTG",
+                                      "HUF",
+                                      "IDR",
+                                      "ILS",
+                                      "IMP",
+                                      "INR",
+                                      "IQD",
+                                      "IRR",
+                                      "ISK",
+                                      "JEP",
+                                      "JMD",
+                                      "JOD",
+                                      "JPY",
+                                      "KES",
+                                      "KGS",
+                                      "KHR",
+                                      "KMF",
+                                      "KPW",
+                                      "KRW",
+                                      "KWD",
+                                      "KYD",
+                                      "KZT",
+                                      "LAK",
+                                      "LBP",
+                                      "LKR",
+                                      "LRD",
+                                      "LSL",
+                                      "LYD",
+                                      "MAD",
+                                      "MDL",
+                                      "MGA",
+                                      "MKD",
+                                      "MMK",
+                                      "MNT",
+                                      "MOP",
+                                      "MRO",
+                                      "MUR",
+                                      "MVR",
+                                      "MWK",
+                                      "MXN",
+                                      "MYR",
+                                      "MZN",
+                                      "NAD",
+                                      "NGN",
+                                      "NIO",
+                                      "NOK",
+                                      "NPR",
+                                      "NZD",
+                                      "OMR",
+                                      "PAB",
+                                      "PEN",
+                                      "PGK",
+                                      "PHP",
+                                      "PKR",
+                                      "PLN",
+                                      "PYG",
+                                      "QAR",
+                                      "RON",
+                                      "RSD",
+                                      "RUB",
+                                      "RWF",
+                                      "SAR",
+                                      "SBD",
+                                      "SCR",
+                                      "SDG",
+                                      "SEK",
+                                      "SGD",
+                                      "SHP",
+                                      "SLL",
+                                      "SOS",
+                                      "SPL",
+                                      "SRD",
+                                      "STD",
+                                      "SVC",
+                                      "SYP",
+                                      "SZL",
+                                      "THB",
+                                      "TJS",
+                                      "TMT",
+                                      "TND",
+                                      "TOP",
+                                      "TRY",
+                                      "TTD",
+                                      "TVD",
+                                      "TWD",
+                                      "TZS",
+                                      "UAH",
+                                      "UGX",
+                                      "USD",
+                                      "UYU",
+                                      "UZS",
+                                      "VEF",
+                                      "VND",
+                                      "VUV",
+                                      "WST",
+                                      "XAF",
+                                      "XCD",
+                                      "XDR",
+                                      "XOF",
+                                      "XPF",
+                                      "XTS",
+                                      "XXX",
+                                      "YER",
+                                      "ZAR",
+                                      "ZMW",
+                                      "ZWD"
+                                    ]
                                   },
                                   {
                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -143346,9 +172645,176 @@
                                                   {
                                                     "title": "ActiveOrHistoricCurrencyCode",
                                                     "type": "string",
-                                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                    "pattern": "^[A-Z]{3,3}$",
-                                                    "example": "USD"
+                                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                    "example": "USD",
+                                                    "minLength": 3,
+                                                    "maxLength": 3,
+                                                    "enum": [
+                                                      "AED",
+                                                      "AFN",
+                                                      "ALL",
+                                                      "AMD",
+                                                      "ANG",
+                                                      "AOA",
+                                                      "ARS",
+                                                      "AUD",
+                                                      "AWG",
+                                                      "AZN",
+                                                      "BAM",
+                                                      "BBD",
+                                                      "BDT",
+                                                      "BGN",
+                                                      "BHD",
+                                                      "BIF",
+                                                      "BMD",
+                                                      "BND",
+                                                      "BOB",
+                                                      "BRL",
+                                                      "BSD",
+                                                      "BTN",
+                                                      "BWP",
+                                                      "BYN",
+                                                      "BZD",
+                                                      "CAD",
+                                                      "CDF",
+                                                      "CHF",
+                                                      "CLP",
+                                                      "CNY",
+                                                      "COP",
+                                                      "CRC",
+                                                      "CUC",
+                                                      "CUP",
+                                                      "CVE",
+                                                      "CZK",
+                                                      "DJF",
+                                                      "DKK",
+                                                      "DOP",
+                                                      "DZD",
+                                                      "EGP",
+                                                      "ERN",
+                                                      "ETB",
+                                                      "EUR",
+                                                      "FJD",
+                                                      "FKP",
+                                                      "GBP",
+                                                      "GEL",
+                                                      "GGP",
+                                                      "GHS",
+                                                      "GIP",
+                                                      "GMD",
+                                                      "GNF",
+                                                      "GTQ",
+                                                      "GYD",
+                                                      "HKD",
+                                                      "HNL",
+                                                      "HRK",
+                                                      "HTG",
+                                                      "HUF",
+                                                      "IDR",
+                                                      "ILS",
+                                                      "IMP",
+                                                      "INR",
+                                                      "IQD",
+                                                      "IRR",
+                                                      "ISK",
+                                                      "JEP",
+                                                      "JMD",
+                                                      "JOD",
+                                                      "JPY",
+                                                      "KES",
+                                                      "KGS",
+                                                      "KHR",
+                                                      "KMF",
+                                                      "KPW",
+                                                      "KRW",
+                                                      "KWD",
+                                                      "KYD",
+                                                      "KZT",
+                                                      "LAK",
+                                                      "LBP",
+                                                      "LKR",
+                                                      "LRD",
+                                                      "LSL",
+                                                      "LYD",
+                                                      "MAD",
+                                                      "MDL",
+                                                      "MGA",
+                                                      "MKD",
+                                                      "MMK",
+                                                      "MNT",
+                                                      "MOP",
+                                                      "MRO",
+                                                      "MUR",
+                                                      "MVR",
+                                                      "MWK",
+                                                      "MXN",
+                                                      "MYR",
+                                                      "MZN",
+                                                      "NAD",
+                                                      "NGN",
+                                                      "NIO",
+                                                      "NOK",
+                                                      "NPR",
+                                                      "NZD",
+                                                      "OMR",
+                                                      "PAB",
+                                                      "PEN",
+                                                      "PGK",
+                                                      "PHP",
+                                                      "PKR",
+                                                      "PLN",
+                                                      "PYG",
+                                                      "QAR",
+                                                      "RON",
+                                                      "RSD",
+                                                      "RUB",
+                                                      "RWF",
+                                                      "SAR",
+                                                      "SBD",
+                                                      "SCR",
+                                                      "SDG",
+                                                      "SEK",
+                                                      "SGD",
+                                                      "SHP",
+                                                      "SLL",
+                                                      "SOS",
+                                                      "SPL",
+                                                      "SRD",
+                                                      "STD",
+                                                      "SVC",
+                                                      "SYP",
+                                                      "SZL",
+                                                      "THB",
+                                                      "TJS",
+                                                      "TMT",
+                                                      "TND",
+                                                      "TOP",
+                                                      "TRY",
+                                                      "TTD",
+                                                      "TVD",
+                                                      "TWD",
+                                                      "TZS",
+                                                      "UAH",
+                                                      "UGX",
+                                                      "USD",
+                                                      "UYU",
+                                                      "UZS",
+                                                      "VEF",
+                                                      "VND",
+                                                      "VUV",
+                                                      "WST",
+                                                      "XAF",
+                                                      "XCD",
+                                                      "XDR",
+                                                      "XOF",
+                                                      "XPF",
+                                                      "XTS",
+                                                      "XXX",
+                                                      "YER",
+                                                      "ZAR",
+                                                      "ZMW",
+                                                      "ZWD"
+                                                    ]
                                                   },
                                                   {
                                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -143395,9 +172861,176 @@
                                                   {
                                                     "title": "ActiveOrHistoricCurrencyCode",
                                                     "type": "string",
-                                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                    "pattern": "^[A-Z]{3,3}$",
-                                                    "example": "USD"
+                                                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                    "example": "USD",
+                                                    "minLength": 3,
+                                                    "maxLength": 3,
+                                                    "enum": [
+                                                      "AED",
+                                                      "AFN",
+                                                      "ALL",
+                                                      "AMD",
+                                                      "ANG",
+                                                      "AOA",
+                                                      "ARS",
+                                                      "AUD",
+                                                      "AWG",
+                                                      "AZN",
+                                                      "BAM",
+                                                      "BBD",
+                                                      "BDT",
+                                                      "BGN",
+                                                      "BHD",
+                                                      "BIF",
+                                                      "BMD",
+                                                      "BND",
+                                                      "BOB",
+                                                      "BRL",
+                                                      "BSD",
+                                                      "BTN",
+                                                      "BWP",
+                                                      "BYN",
+                                                      "BZD",
+                                                      "CAD",
+                                                      "CDF",
+                                                      "CHF",
+                                                      "CLP",
+                                                      "CNY",
+                                                      "COP",
+                                                      "CRC",
+                                                      "CUC",
+                                                      "CUP",
+                                                      "CVE",
+                                                      "CZK",
+                                                      "DJF",
+                                                      "DKK",
+                                                      "DOP",
+                                                      "DZD",
+                                                      "EGP",
+                                                      "ERN",
+                                                      "ETB",
+                                                      "EUR",
+                                                      "FJD",
+                                                      "FKP",
+                                                      "GBP",
+                                                      "GEL",
+                                                      "GGP",
+                                                      "GHS",
+                                                      "GIP",
+                                                      "GMD",
+                                                      "GNF",
+                                                      "GTQ",
+                                                      "GYD",
+                                                      "HKD",
+                                                      "HNL",
+                                                      "HRK",
+                                                      "HTG",
+                                                      "HUF",
+                                                      "IDR",
+                                                      "ILS",
+                                                      "IMP",
+                                                      "INR",
+                                                      "IQD",
+                                                      "IRR",
+                                                      "ISK",
+                                                      "JEP",
+                                                      "JMD",
+                                                      "JOD",
+                                                      "JPY",
+                                                      "KES",
+                                                      "KGS",
+                                                      "KHR",
+                                                      "KMF",
+                                                      "KPW",
+                                                      "KRW",
+                                                      "KWD",
+                                                      "KYD",
+                                                      "KZT",
+                                                      "LAK",
+                                                      "LBP",
+                                                      "LKR",
+                                                      "LRD",
+                                                      "LSL",
+                                                      "LYD",
+                                                      "MAD",
+                                                      "MDL",
+                                                      "MGA",
+                                                      "MKD",
+                                                      "MMK",
+                                                      "MNT",
+                                                      "MOP",
+                                                      "MRO",
+                                                      "MUR",
+                                                      "MVR",
+                                                      "MWK",
+                                                      "MXN",
+                                                      "MYR",
+                                                      "MZN",
+                                                      "NAD",
+                                                      "NGN",
+                                                      "NIO",
+                                                      "NOK",
+                                                      "NPR",
+                                                      "NZD",
+                                                      "OMR",
+                                                      "PAB",
+                                                      "PEN",
+                                                      "PGK",
+                                                      "PHP",
+                                                      "PKR",
+                                                      "PLN",
+                                                      "PYG",
+                                                      "QAR",
+                                                      "RON",
+                                                      "RSD",
+                                                      "RUB",
+                                                      "RWF",
+                                                      "SAR",
+                                                      "SBD",
+                                                      "SCR",
+                                                      "SDG",
+                                                      "SEK",
+                                                      "SGD",
+                                                      "SHP",
+                                                      "SLL",
+                                                      "SOS",
+                                                      "SPL",
+                                                      "SRD",
+                                                      "STD",
+                                                      "SVC",
+                                                      "SYP",
+                                                      "SZL",
+                                                      "THB",
+                                                      "TJS",
+                                                      "TMT",
+                                                      "TND",
+                                                      "TOP",
+                                                      "TRY",
+                                                      "TTD",
+                                                      "TVD",
+                                                      "TWD",
+                                                      "TZS",
+                                                      "UAH",
+                                                      "UGX",
+                                                      "USD",
+                                                      "UYU",
+                                                      "UZS",
+                                                      "VEF",
+                                                      "VND",
+                                                      "VUV",
+                                                      "WST",
+                                                      "XAF",
+                                                      "XCD",
+                                                      "XDR",
+                                                      "XOF",
+                                                      "XPF",
+                                                      "XTS",
+                                                      "XXX",
+                                                      "YER",
+                                                      "ZAR",
+                                                      "ZMW",
+                                                      "ZWD"
+                                                    ]
                                                   },
                                                   {
                                                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -143571,9 +173204,176 @@
                                                           {
                                                             "title": "ActiveOrHistoricCurrencyCode",
                                                             "type": "string",
-                                                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                            "pattern": "^[A-Z]{3,3}$",
-                                                            "example": "USD"
+                                                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                            "example": "USD",
+                                                            "minLength": 3,
+                                                            "maxLength": 3,
+                                                            "enum": [
+                                                              "AED",
+                                                              "AFN",
+                                                              "ALL",
+                                                              "AMD",
+                                                              "ANG",
+                                                              "AOA",
+                                                              "ARS",
+                                                              "AUD",
+                                                              "AWG",
+                                                              "AZN",
+                                                              "BAM",
+                                                              "BBD",
+                                                              "BDT",
+                                                              "BGN",
+                                                              "BHD",
+                                                              "BIF",
+                                                              "BMD",
+                                                              "BND",
+                                                              "BOB",
+                                                              "BRL",
+                                                              "BSD",
+                                                              "BTN",
+                                                              "BWP",
+                                                              "BYN",
+                                                              "BZD",
+                                                              "CAD",
+                                                              "CDF",
+                                                              "CHF",
+                                                              "CLP",
+                                                              "CNY",
+                                                              "COP",
+                                                              "CRC",
+                                                              "CUC",
+                                                              "CUP",
+                                                              "CVE",
+                                                              "CZK",
+                                                              "DJF",
+                                                              "DKK",
+                                                              "DOP",
+                                                              "DZD",
+                                                              "EGP",
+                                                              "ERN",
+                                                              "ETB",
+                                                              "EUR",
+                                                              "FJD",
+                                                              "FKP",
+                                                              "GBP",
+                                                              "GEL",
+                                                              "GGP",
+                                                              "GHS",
+                                                              "GIP",
+                                                              "GMD",
+                                                              "GNF",
+                                                              "GTQ",
+                                                              "GYD",
+                                                              "HKD",
+                                                              "HNL",
+                                                              "HRK",
+                                                              "HTG",
+                                                              "HUF",
+                                                              "IDR",
+                                                              "ILS",
+                                                              "IMP",
+                                                              "INR",
+                                                              "IQD",
+                                                              "IRR",
+                                                              "ISK",
+                                                              "JEP",
+                                                              "JMD",
+                                                              "JOD",
+                                                              "JPY",
+                                                              "KES",
+                                                              "KGS",
+                                                              "KHR",
+                                                              "KMF",
+                                                              "KPW",
+                                                              "KRW",
+                                                              "KWD",
+                                                              "KYD",
+                                                              "KZT",
+                                                              "LAK",
+                                                              "LBP",
+                                                              "LKR",
+                                                              "LRD",
+                                                              "LSL",
+                                                              "LYD",
+                                                              "MAD",
+                                                              "MDL",
+                                                              "MGA",
+                                                              "MKD",
+                                                              "MMK",
+                                                              "MNT",
+                                                              "MOP",
+                                                              "MRO",
+                                                              "MUR",
+                                                              "MVR",
+                                                              "MWK",
+                                                              "MXN",
+                                                              "MYR",
+                                                              "MZN",
+                                                              "NAD",
+                                                              "NGN",
+                                                              "NIO",
+                                                              "NOK",
+                                                              "NPR",
+                                                              "NZD",
+                                                              "OMR",
+                                                              "PAB",
+                                                              "PEN",
+                                                              "PGK",
+                                                              "PHP",
+                                                              "PKR",
+                                                              "PLN",
+                                                              "PYG",
+                                                              "QAR",
+                                                              "RON",
+                                                              "RSD",
+                                                              "RUB",
+                                                              "RWF",
+                                                              "SAR",
+                                                              "SBD",
+                                                              "SCR",
+                                                              "SDG",
+                                                              "SEK",
+                                                              "SGD",
+                                                              "SHP",
+                                                              "SLL",
+                                                              "SOS",
+                                                              "SPL",
+                                                              "SRD",
+                                                              "STD",
+                                                              "SVC",
+                                                              "SYP",
+                                                              "SZL",
+                                                              "THB",
+                                                              "TJS",
+                                                              "TMT",
+                                                              "TND",
+                                                              "TOP",
+                                                              "TRY",
+                                                              "TTD",
+                                                              "TVD",
+                                                              "TWD",
+                                                              "TZS",
+                                                              "UAH",
+                                                              "UGX",
+                                                              "USD",
+                                                              "UYU",
+                                                              "UZS",
+                                                              "VEF",
+                                                              "VND",
+                                                              "VUV",
+                                                              "WST",
+                                                              "XAF",
+                                                              "XCD",
+                                                              "XDR",
+                                                              "XOF",
+                                                              "XPF",
+                                                              "XTS",
+                                                              "XXX",
+                                                              "YER",
+                                                              "ZAR",
+                                                              "ZMW",
+                                                              "ZWD"
+                                                            ]
                                                           },
                                                           {
                                                             "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -143764,9 +173564,176 @@
                                                             {
                                                               "title": "ActiveOrHistoricCurrencyCode",
                                                               "type": "string",
-                                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                              "pattern": "^[A-Z]{3,3}$",
-                                                              "example": "USD"
+                                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                              "example": "USD",
+                                                              "minLength": 3,
+                                                              "maxLength": 3,
+                                                              "enum": [
+                                                                "AED",
+                                                                "AFN",
+                                                                "ALL",
+                                                                "AMD",
+                                                                "ANG",
+                                                                "AOA",
+                                                                "ARS",
+                                                                "AUD",
+                                                                "AWG",
+                                                                "AZN",
+                                                                "BAM",
+                                                                "BBD",
+                                                                "BDT",
+                                                                "BGN",
+                                                                "BHD",
+                                                                "BIF",
+                                                                "BMD",
+                                                                "BND",
+                                                                "BOB",
+                                                                "BRL",
+                                                                "BSD",
+                                                                "BTN",
+                                                                "BWP",
+                                                                "BYN",
+                                                                "BZD",
+                                                                "CAD",
+                                                                "CDF",
+                                                                "CHF",
+                                                                "CLP",
+                                                                "CNY",
+                                                                "COP",
+                                                                "CRC",
+                                                                "CUC",
+                                                                "CUP",
+                                                                "CVE",
+                                                                "CZK",
+                                                                "DJF",
+                                                                "DKK",
+                                                                "DOP",
+                                                                "DZD",
+                                                                "EGP",
+                                                                "ERN",
+                                                                "ETB",
+                                                                "EUR",
+                                                                "FJD",
+                                                                "FKP",
+                                                                "GBP",
+                                                                "GEL",
+                                                                "GGP",
+                                                                "GHS",
+                                                                "GIP",
+                                                                "GMD",
+                                                                "GNF",
+                                                                "GTQ",
+                                                                "GYD",
+                                                                "HKD",
+                                                                "HNL",
+                                                                "HRK",
+                                                                "HTG",
+                                                                "HUF",
+                                                                "IDR",
+                                                                "ILS",
+                                                                "IMP",
+                                                                "INR",
+                                                                "IQD",
+                                                                "IRR",
+                                                                "ISK",
+                                                                "JEP",
+                                                                "JMD",
+                                                                "JOD",
+                                                                "JPY",
+                                                                "KES",
+                                                                "KGS",
+                                                                "KHR",
+                                                                "KMF",
+                                                                "KPW",
+                                                                "KRW",
+                                                                "KWD",
+                                                                "KYD",
+                                                                "KZT",
+                                                                "LAK",
+                                                                "LBP",
+                                                                "LKR",
+                                                                "LRD",
+                                                                "LSL",
+                                                                "LYD",
+                                                                "MAD",
+                                                                "MDL",
+                                                                "MGA",
+                                                                "MKD",
+                                                                "MMK",
+                                                                "MNT",
+                                                                "MOP",
+                                                                "MRO",
+                                                                "MUR",
+                                                                "MVR",
+                                                                "MWK",
+                                                                "MXN",
+                                                                "MYR",
+                                                                "MZN",
+                                                                "NAD",
+                                                                "NGN",
+                                                                "NIO",
+                                                                "NOK",
+                                                                "NPR",
+                                                                "NZD",
+                                                                "OMR",
+                                                                "PAB",
+                                                                "PEN",
+                                                                "PGK",
+                                                                "PHP",
+                                                                "PKR",
+                                                                "PLN",
+                                                                "PYG",
+                                                                "QAR",
+                                                                "RON",
+                                                                "RSD",
+                                                                "RUB",
+                                                                "RWF",
+                                                                "SAR",
+                                                                "SBD",
+                                                                "SCR",
+                                                                "SDG",
+                                                                "SEK",
+                                                                "SGD",
+                                                                "SHP",
+                                                                "SLL",
+                                                                "SOS",
+                                                                "SPL",
+                                                                "SRD",
+                                                                "STD",
+                                                                "SVC",
+                                                                "SYP",
+                                                                "SZL",
+                                                                "THB",
+                                                                "TJS",
+                                                                "TMT",
+                                                                "TND",
+                                                                "TOP",
+                                                                "TRY",
+                                                                "TTD",
+                                                                "TVD",
+                                                                "TWD",
+                                                                "TZS",
+                                                                "UAH",
+                                                                "UGX",
+                                                                "USD",
+                                                                "UYU",
+                                                                "UZS",
+                                                                "VEF",
+                                                                "VND",
+                                                                "VUV",
+                                                                "WST",
+                                                                "XAF",
+                                                                "XCD",
+                                                                "XDR",
+                                                                "XOF",
+                                                                "XPF",
+                                                                "XTS",
+                                                                "XXX",
+                                                                "YER",
+                                                                "ZAR",
+                                                                "ZMW",
+                                                                "ZWD"
+                                                              ]
                                                             },
                                                             {
                                                               "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -144144,9 +174111,176 @@
                                                     {
                                                       "title": "ActiveOrHistoricCurrencyCode",
                                                       "type": "string",
-                                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                      "pattern": "^[A-Z]{3,3}$",
-                                                      "example": "USD"
+                                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                      "example": "USD",
+                                                      "minLength": 3,
+                                                      "maxLength": 3,
+                                                      "enum": [
+                                                        "AED",
+                                                        "AFN",
+                                                        "ALL",
+                                                        "AMD",
+                                                        "ANG",
+                                                        "AOA",
+                                                        "ARS",
+                                                        "AUD",
+                                                        "AWG",
+                                                        "AZN",
+                                                        "BAM",
+                                                        "BBD",
+                                                        "BDT",
+                                                        "BGN",
+                                                        "BHD",
+                                                        "BIF",
+                                                        "BMD",
+                                                        "BND",
+                                                        "BOB",
+                                                        "BRL",
+                                                        "BSD",
+                                                        "BTN",
+                                                        "BWP",
+                                                        "BYN",
+                                                        "BZD",
+                                                        "CAD",
+                                                        "CDF",
+                                                        "CHF",
+                                                        "CLP",
+                                                        "CNY",
+                                                        "COP",
+                                                        "CRC",
+                                                        "CUC",
+                                                        "CUP",
+                                                        "CVE",
+                                                        "CZK",
+                                                        "DJF",
+                                                        "DKK",
+                                                        "DOP",
+                                                        "DZD",
+                                                        "EGP",
+                                                        "ERN",
+                                                        "ETB",
+                                                        "EUR",
+                                                        "FJD",
+                                                        "FKP",
+                                                        "GBP",
+                                                        "GEL",
+                                                        "GGP",
+                                                        "GHS",
+                                                        "GIP",
+                                                        "GMD",
+                                                        "GNF",
+                                                        "GTQ",
+                                                        "GYD",
+                                                        "HKD",
+                                                        "HNL",
+                                                        "HRK",
+                                                        "HTG",
+                                                        "HUF",
+                                                        "IDR",
+                                                        "ILS",
+                                                        "IMP",
+                                                        "INR",
+                                                        "IQD",
+                                                        "IRR",
+                                                        "ISK",
+                                                        "JEP",
+                                                        "JMD",
+                                                        "JOD",
+                                                        "JPY",
+                                                        "KES",
+                                                        "KGS",
+                                                        "KHR",
+                                                        "KMF",
+                                                        "KPW",
+                                                        "KRW",
+                                                        "KWD",
+                                                        "KYD",
+                                                        "KZT",
+                                                        "LAK",
+                                                        "LBP",
+                                                        "LKR",
+                                                        "LRD",
+                                                        "LSL",
+                                                        "LYD",
+                                                        "MAD",
+                                                        "MDL",
+                                                        "MGA",
+                                                        "MKD",
+                                                        "MMK",
+                                                        "MNT",
+                                                        "MOP",
+                                                        "MRO",
+                                                        "MUR",
+                                                        "MVR",
+                                                        "MWK",
+                                                        "MXN",
+                                                        "MYR",
+                                                        "MZN",
+                                                        "NAD",
+                                                        "NGN",
+                                                        "NIO",
+                                                        "NOK",
+                                                        "NPR",
+                                                        "NZD",
+                                                        "OMR",
+                                                        "PAB",
+                                                        "PEN",
+                                                        "PGK",
+                                                        "PHP",
+                                                        "PKR",
+                                                        "PLN",
+                                                        "PYG",
+                                                        "QAR",
+                                                        "RON",
+                                                        "RSD",
+                                                        "RUB",
+                                                        "RWF",
+                                                        "SAR",
+                                                        "SBD",
+                                                        "SCR",
+                                                        "SDG",
+                                                        "SEK",
+                                                        "SGD",
+                                                        "SHP",
+                                                        "SLL",
+                                                        "SOS",
+                                                        "SPL",
+                                                        "SRD",
+                                                        "STD",
+                                                        "SVC",
+                                                        "SYP",
+                                                        "SZL",
+                                                        "THB",
+                                                        "TJS",
+                                                        "TMT",
+                                                        "TND",
+                                                        "TOP",
+                                                        "TRY",
+                                                        "TTD",
+                                                        "TVD",
+                                                        "TWD",
+                                                        "TZS",
+                                                        "UAH",
+                                                        "UGX",
+                                                        "USD",
+                                                        "UYU",
+                                                        "UZS",
+                                                        "VEF",
+                                                        "VND",
+                                                        "VUV",
+                                                        "WST",
+                                                        "XAF",
+                                                        "XCD",
+                                                        "XDR",
+                                                        "XOF",
+                                                        "XPF",
+                                                        "XTS",
+                                                        "XXX",
+                                                        "YER",
+                                                        "ZAR",
+                                                        "ZMW",
+                                                        "ZWD"
+                                                      ]
                                                     },
                                                     {
                                                       "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -144193,9 +174327,176 @@
                                                     {
                                                       "title": "ActiveOrHistoricCurrencyCode",
                                                       "type": "string",
-                                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                      "pattern": "^[A-Z]{3,3}$",
-                                                      "example": "USD"
+                                                      "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                      "example": "USD",
+                                                      "minLength": 3,
+                                                      "maxLength": 3,
+                                                      "enum": [
+                                                        "AED",
+                                                        "AFN",
+                                                        "ALL",
+                                                        "AMD",
+                                                        "ANG",
+                                                        "AOA",
+                                                        "ARS",
+                                                        "AUD",
+                                                        "AWG",
+                                                        "AZN",
+                                                        "BAM",
+                                                        "BBD",
+                                                        "BDT",
+                                                        "BGN",
+                                                        "BHD",
+                                                        "BIF",
+                                                        "BMD",
+                                                        "BND",
+                                                        "BOB",
+                                                        "BRL",
+                                                        "BSD",
+                                                        "BTN",
+                                                        "BWP",
+                                                        "BYN",
+                                                        "BZD",
+                                                        "CAD",
+                                                        "CDF",
+                                                        "CHF",
+                                                        "CLP",
+                                                        "CNY",
+                                                        "COP",
+                                                        "CRC",
+                                                        "CUC",
+                                                        "CUP",
+                                                        "CVE",
+                                                        "CZK",
+                                                        "DJF",
+                                                        "DKK",
+                                                        "DOP",
+                                                        "DZD",
+                                                        "EGP",
+                                                        "ERN",
+                                                        "ETB",
+                                                        "EUR",
+                                                        "FJD",
+                                                        "FKP",
+                                                        "GBP",
+                                                        "GEL",
+                                                        "GGP",
+                                                        "GHS",
+                                                        "GIP",
+                                                        "GMD",
+                                                        "GNF",
+                                                        "GTQ",
+                                                        "GYD",
+                                                        "HKD",
+                                                        "HNL",
+                                                        "HRK",
+                                                        "HTG",
+                                                        "HUF",
+                                                        "IDR",
+                                                        "ILS",
+                                                        "IMP",
+                                                        "INR",
+                                                        "IQD",
+                                                        "IRR",
+                                                        "ISK",
+                                                        "JEP",
+                                                        "JMD",
+                                                        "JOD",
+                                                        "JPY",
+                                                        "KES",
+                                                        "KGS",
+                                                        "KHR",
+                                                        "KMF",
+                                                        "KPW",
+                                                        "KRW",
+                                                        "KWD",
+                                                        "KYD",
+                                                        "KZT",
+                                                        "LAK",
+                                                        "LBP",
+                                                        "LKR",
+                                                        "LRD",
+                                                        "LSL",
+                                                        "LYD",
+                                                        "MAD",
+                                                        "MDL",
+                                                        "MGA",
+                                                        "MKD",
+                                                        "MMK",
+                                                        "MNT",
+                                                        "MOP",
+                                                        "MRO",
+                                                        "MUR",
+                                                        "MVR",
+                                                        "MWK",
+                                                        "MXN",
+                                                        "MYR",
+                                                        "MZN",
+                                                        "NAD",
+                                                        "NGN",
+                                                        "NIO",
+                                                        "NOK",
+                                                        "NPR",
+                                                        "NZD",
+                                                        "OMR",
+                                                        "PAB",
+                                                        "PEN",
+                                                        "PGK",
+                                                        "PHP",
+                                                        "PKR",
+                                                        "PLN",
+                                                        "PYG",
+                                                        "QAR",
+                                                        "RON",
+                                                        "RSD",
+                                                        "RUB",
+                                                        "RWF",
+                                                        "SAR",
+                                                        "SBD",
+                                                        "SCR",
+                                                        "SDG",
+                                                        "SEK",
+                                                        "SGD",
+                                                        "SHP",
+                                                        "SLL",
+                                                        "SOS",
+                                                        "SPL",
+                                                        "SRD",
+                                                        "STD",
+                                                        "SVC",
+                                                        "SYP",
+                                                        "SZL",
+                                                        "THB",
+                                                        "TJS",
+                                                        "TMT",
+                                                        "TND",
+                                                        "TOP",
+                                                        "TRY",
+                                                        "TTD",
+                                                        "TVD",
+                                                        "TWD",
+                                                        "TZS",
+                                                        "UAH",
+                                                        "UGX",
+                                                        "USD",
+                                                        "UYU",
+                                                        "UZS",
+                                                        "VEF",
+                                                        "VND",
+                                                        "VUV",
+                                                        "WST",
+                                                        "XAF",
+                                                        "XCD",
+                                                        "XDR",
+                                                        "XOF",
+                                                        "XPF",
+                                                        "XTS",
+                                                        "XXX",
+                                                        "YER",
+                                                        "ZAR",
+                                                        "ZMW",
+                                                        "ZWD"
+                                                      ]
                                                     },
                                                     {
                                                       "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -144369,9 +174670,176 @@
                                                             {
                                                               "title": "ActiveOrHistoricCurrencyCode",
                                                               "type": "string",
-                                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                              "pattern": "^[A-Z]{3,3}$",
-                                                              "example": "USD"
+                                                              "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                              "example": "USD",
+                                                              "minLength": 3,
+                                                              "maxLength": 3,
+                                                              "enum": [
+                                                                "AED",
+                                                                "AFN",
+                                                                "ALL",
+                                                                "AMD",
+                                                                "ANG",
+                                                                "AOA",
+                                                                "ARS",
+                                                                "AUD",
+                                                                "AWG",
+                                                                "AZN",
+                                                                "BAM",
+                                                                "BBD",
+                                                                "BDT",
+                                                                "BGN",
+                                                                "BHD",
+                                                                "BIF",
+                                                                "BMD",
+                                                                "BND",
+                                                                "BOB",
+                                                                "BRL",
+                                                                "BSD",
+                                                                "BTN",
+                                                                "BWP",
+                                                                "BYN",
+                                                                "BZD",
+                                                                "CAD",
+                                                                "CDF",
+                                                                "CHF",
+                                                                "CLP",
+                                                                "CNY",
+                                                                "COP",
+                                                                "CRC",
+                                                                "CUC",
+                                                                "CUP",
+                                                                "CVE",
+                                                                "CZK",
+                                                                "DJF",
+                                                                "DKK",
+                                                                "DOP",
+                                                                "DZD",
+                                                                "EGP",
+                                                                "ERN",
+                                                                "ETB",
+                                                                "EUR",
+                                                                "FJD",
+                                                                "FKP",
+                                                                "GBP",
+                                                                "GEL",
+                                                                "GGP",
+                                                                "GHS",
+                                                                "GIP",
+                                                                "GMD",
+                                                                "GNF",
+                                                                "GTQ",
+                                                                "GYD",
+                                                                "HKD",
+                                                                "HNL",
+                                                                "HRK",
+                                                                "HTG",
+                                                                "HUF",
+                                                                "IDR",
+                                                                "ILS",
+                                                                "IMP",
+                                                                "INR",
+                                                                "IQD",
+                                                                "IRR",
+                                                                "ISK",
+                                                                "JEP",
+                                                                "JMD",
+                                                                "JOD",
+                                                                "JPY",
+                                                                "KES",
+                                                                "KGS",
+                                                                "KHR",
+                                                                "KMF",
+                                                                "KPW",
+                                                                "KRW",
+                                                                "KWD",
+                                                                "KYD",
+                                                                "KZT",
+                                                                "LAK",
+                                                                "LBP",
+                                                                "LKR",
+                                                                "LRD",
+                                                                "LSL",
+                                                                "LYD",
+                                                                "MAD",
+                                                                "MDL",
+                                                                "MGA",
+                                                                "MKD",
+                                                                "MMK",
+                                                                "MNT",
+                                                                "MOP",
+                                                                "MRO",
+                                                                "MUR",
+                                                                "MVR",
+                                                                "MWK",
+                                                                "MXN",
+                                                                "MYR",
+                                                                "MZN",
+                                                                "NAD",
+                                                                "NGN",
+                                                                "NIO",
+                                                                "NOK",
+                                                                "NPR",
+                                                                "NZD",
+                                                                "OMR",
+                                                                "PAB",
+                                                                "PEN",
+                                                                "PGK",
+                                                                "PHP",
+                                                                "PKR",
+                                                                "PLN",
+                                                                "PYG",
+                                                                "QAR",
+                                                                "RON",
+                                                                "RSD",
+                                                                "RUB",
+                                                                "RWF",
+                                                                "SAR",
+                                                                "SBD",
+                                                                "SCR",
+                                                                "SDG",
+                                                                "SEK",
+                                                                "SGD",
+                                                                "SHP",
+                                                                "SLL",
+                                                                "SOS",
+                                                                "SPL",
+                                                                "SRD",
+                                                                "STD",
+                                                                "SVC",
+                                                                "SYP",
+                                                                "SZL",
+                                                                "THB",
+                                                                "TJS",
+                                                                "TMT",
+                                                                "TND",
+                                                                "TOP",
+                                                                "TRY",
+                                                                "TTD",
+                                                                "TVD",
+                                                                "TWD",
+                                                                "TZS",
+                                                                "UAH",
+                                                                "UGX",
+                                                                "USD",
+                                                                "UYU",
+                                                                "UZS",
+                                                                "VEF",
+                                                                "VND",
+                                                                "VUV",
+                                                                "WST",
+                                                                "XAF",
+                                                                "XCD",
+                                                                "XDR",
+                                                                "XOF",
+                                                                "XPF",
+                                                                "XTS",
+                                                                "XXX",
+                                                                "YER",
+                                                                "ZAR",
+                                                                "ZMW",
+                                                                "ZWD"
+                                                              ]
                                                             },
                                                             {
                                                               "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -144562,9 +175030,176 @@
                                                               {
                                                                 "title": "ActiveOrHistoricCurrencyCode",
                                                                 "type": "string",
-                                                                "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                                                                "pattern": "^[A-Z]{3,3}$",
-                                                                "example": "USD"
+                                                                "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                                                                "example": "USD",
+                                                                "minLength": 3,
+                                                                "maxLength": 3,
+                                                                "enum": [
+                                                                  "AED",
+                                                                  "AFN",
+                                                                  "ALL",
+                                                                  "AMD",
+                                                                  "ANG",
+                                                                  "AOA",
+                                                                  "ARS",
+                                                                  "AUD",
+                                                                  "AWG",
+                                                                  "AZN",
+                                                                  "BAM",
+                                                                  "BBD",
+                                                                  "BDT",
+                                                                  "BGN",
+                                                                  "BHD",
+                                                                  "BIF",
+                                                                  "BMD",
+                                                                  "BND",
+                                                                  "BOB",
+                                                                  "BRL",
+                                                                  "BSD",
+                                                                  "BTN",
+                                                                  "BWP",
+                                                                  "BYN",
+                                                                  "BZD",
+                                                                  "CAD",
+                                                                  "CDF",
+                                                                  "CHF",
+                                                                  "CLP",
+                                                                  "CNY",
+                                                                  "COP",
+                                                                  "CRC",
+                                                                  "CUC",
+                                                                  "CUP",
+                                                                  "CVE",
+                                                                  "CZK",
+                                                                  "DJF",
+                                                                  "DKK",
+                                                                  "DOP",
+                                                                  "DZD",
+                                                                  "EGP",
+                                                                  "ERN",
+                                                                  "ETB",
+                                                                  "EUR",
+                                                                  "FJD",
+                                                                  "FKP",
+                                                                  "GBP",
+                                                                  "GEL",
+                                                                  "GGP",
+                                                                  "GHS",
+                                                                  "GIP",
+                                                                  "GMD",
+                                                                  "GNF",
+                                                                  "GTQ",
+                                                                  "GYD",
+                                                                  "HKD",
+                                                                  "HNL",
+                                                                  "HRK",
+                                                                  "HTG",
+                                                                  "HUF",
+                                                                  "IDR",
+                                                                  "ILS",
+                                                                  "IMP",
+                                                                  "INR",
+                                                                  "IQD",
+                                                                  "IRR",
+                                                                  "ISK",
+                                                                  "JEP",
+                                                                  "JMD",
+                                                                  "JOD",
+                                                                  "JPY",
+                                                                  "KES",
+                                                                  "KGS",
+                                                                  "KHR",
+                                                                  "KMF",
+                                                                  "KPW",
+                                                                  "KRW",
+                                                                  "KWD",
+                                                                  "KYD",
+                                                                  "KZT",
+                                                                  "LAK",
+                                                                  "LBP",
+                                                                  "LKR",
+                                                                  "LRD",
+                                                                  "LSL",
+                                                                  "LYD",
+                                                                  "MAD",
+                                                                  "MDL",
+                                                                  "MGA",
+                                                                  "MKD",
+                                                                  "MMK",
+                                                                  "MNT",
+                                                                  "MOP",
+                                                                  "MRO",
+                                                                  "MUR",
+                                                                  "MVR",
+                                                                  "MWK",
+                                                                  "MXN",
+                                                                  "MYR",
+                                                                  "MZN",
+                                                                  "NAD",
+                                                                  "NGN",
+                                                                  "NIO",
+                                                                  "NOK",
+                                                                  "NPR",
+                                                                  "NZD",
+                                                                  "OMR",
+                                                                  "PAB",
+                                                                  "PEN",
+                                                                  "PGK",
+                                                                  "PHP",
+                                                                  "PKR",
+                                                                  "PLN",
+                                                                  "PYG",
+                                                                  "QAR",
+                                                                  "RON",
+                                                                  "RSD",
+                                                                  "RUB",
+                                                                  "RWF",
+                                                                  "SAR",
+                                                                  "SBD",
+                                                                  "SCR",
+                                                                  "SDG",
+                                                                  "SEK",
+                                                                  "SGD",
+                                                                  "SHP",
+                                                                  "SLL",
+                                                                  "SOS",
+                                                                  "SPL",
+                                                                  "SRD",
+                                                                  "STD",
+                                                                  "SVC",
+                                                                  "SYP",
+                                                                  "SZL",
+                                                                  "THB",
+                                                                  "TJS",
+                                                                  "TMT",
+                                                                  "TND",
+                                                                  "TOP",
+                                                                  "TRY",
+                                                                  "TTD",
+                                                                  "TVD",
+                                                                  "TWD",
+                                                                  "TZS",
+                                                                  "UAH",
+                                                                  "UGX",
+                                                                  "USD",
+                                                                  "UYU",
+                                                                  "UZS",
+                                                                  "VEF",
+                                                                  "VND",
+                                                                  "VUV",
+                                                                  "WST",
+                                                                  "XAF",
+                                                                  "XCD",
+                                                                  "XDR",
+                                                                  "XOF",
+                                                                  "XPF",
+                                                                  "XTS",
+                                                                  "XXX",
+                                                                  "YER",
+                                                                  "ZAR",
+                                                                  "ZMW",
+                                                                  "ZWD"
+                                                                ]
                                                               },
                                                               {
                                                                 "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -144761,9 +175396,10 @@
                         "allOf": [
                           {
                             "title": "Exact32HexBinaryText",
-                            "description": "Specifies a hexadecimal string with a length of 32 characters.\n",
+                            "description": "Specifies a hexadecimal string.\n\nNOTE: This pattern is not the original ISO20022 specification.\n",
                             "type": "string",
-                            "example": "1234567890ABCDEF1234567890ABCDEF"
+                            "pattern": "^[A-Za-z0-9-_]{43}$",
+                            "maxLength": 48
                           },
                           {
                             "description": "SHA-256 signature of the terms\n"
@@ -144933,6 +175569,12 @@
       }
     }
   },
+  "ULIDIdentifier": {
+    "title": "ULIDIdentifier",
+    "type": "string",
+    "pattern": "^[0-9A-HJKMNP-TV-Z]{26}$",
+    "example": "01AN4Z07BY79KA1307SR9X4MV3"
+  },
   "UUIDv4Identifier": {
     "title": "UUIDv4Identifier",
     "type": "string",
@@ -144968,9 +175610,176 @@
                   {
                     "title": "ActiveOrHistoricCurrencyCode",
                     "type": "string",
-                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                    "pattern": "^[A-Z]{3,3}$",
-                    "example": "USD"
+                    "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                    "example": "USD",
+                    "minLength": 3,
+                    "maxLength": 3,
+                    "enum": [
+                      "AED",
+                      "AFN",
+                      "ALL",
+                      "AMD",
+                      "ANG",
+                      "AOA",
+                      "ARS",
+                      "AUD",
+                      "AWG",
+                      "AZN",
+                      "BAM",
+                      "BBD",
+                      "BDT",
+                      "BGN",
+                      "BHD",
+                      "BIF",
+                      "BMD",
+                      "BND",
+                      "BOB",
+                      "BRL",
+                      "BSD",
+                      "BTN",
+                      "BWP",
+                      "BYN",
+                      "BZD",
+                      "CAD",
+                      "CDF",
+                      "CHF",
+                      "CLP",
+                      "CNY",
+                      "COP",
+                      "CRC",
+                      "CUC",
+                      "CUP",
+                      "CVE",
+                      "CZK",
+                      "DJF",
+                      "DKK",
+                      "DOP",
+                      "DZD",
+                      "EGP",
+                      "ERN",
+                      "ETB",
+                      "EUR",
+                      "FJD",
+                      "FKP",
+                      "GBP",
+                      "GEL",
+                      "GGP",
+                      "GHS",
+                      "GIP",
+                      "GMD",
+                      "GNF",
+                      "GTQ",
+                      "GYD",
+                      "HKD",
+                      "HNL",
+                      "HRK",
+                      "HTG",
+                      "HUF",
+                      "IDR",
+                      "ILS",
+                      "IMP",
+                      "INR",
+                      "IQD",
+                      "IRR",
+                      "ISK",
+                      "JEP",
+                      "JMD",
+                      "JOD",
+                      "JPY",
+                      "KES",
+                      "KGS",
+                      "KHR",
+                      "KMF",
+                      "KPW",
+                      "KRW",
+                      "KWD",
+                      "KYD",
+                      "KZT",
+                      "LAK",
+                      "LBP",
+                      "LKR",
+                      "LRD",
+                      "LSL",
+                      "LYD",
+                      "MAD",
+                      "MDL",
+                      "MGA",
+                      "MKD",
+                      "MMK",
+                      "MNT",
+                      "MOP",
+                      "MRO",
+                      "MUR",
+                      "MVR",
+                      "MWK",
+                      "MXN",
+                      "MYR",
+                      "MZN",
+                      "NAD",
+                      "NGN",
+                      "NIO",
+                      "NOK",
+                      "NPR",
+                      "NZD",
+                      "OMR",
+                      "PAB",
+                      "PEN",
+                      "PGK",
+                      "PHP",
+                      "PKR",
+                      "PLN",
+                      "PYG",
+                      "QAR",
+                      "RON",
+                      "RSD",
+                      "RUB",
+                      "RWF",
+                      "SAR",
+                      "SBD",
+                      "SCR",
+                      "SDG",
+                      "SEK",
+                      "SGD",
+                      "SHP",
+                      "SLL",
+                      "SOS",
+                      "SPL",
+                      "SRD",
+                      "STD",
+                      "SVC",
+                      "SYP",
+                      "SZL",
+                      "THB",
+                      "TJS",
+                      "TMT",
+                      "TND",
+                      "TOP",
+                      "TRY",
+                      "TTD",
+                      "TVD",
+                      "TWD",
+                      "TZS",
+                      "UAH",
+                      "UGX",
+                      "USD",
+                      "UYU",
+                      "UZS",
+                      "VEF",
+                      "VND",
+                      "VUV",
+                      "WST",
+                      "XAF",
+                      "XCD",
+                      "XDR",
+                      "XOF",
+                      "XPF",
+                      "XTS",
+                      "XXX",
+                      "YER",
+                      "ZAR",
+                      "ZMW",
+                      "ZWD"
+                    ]
                   },
                   {
                     "description": "Currency\nIdentification of the currency in which the account is held.\n"
@@ -150403,9 +181212,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
@@ -152774,9 +183750,176 @@
                           {
                             "title": "ActiveOrHistoricCurrencyCode",
                             "type": "string",
-                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\n",
-                            "pattern": "^[A-Z]{3,3}$",
-                            "example": "USD"
+                            "description": "A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\".\nNOTE: This has been modified away from the original ISO20022 pattern to enums.\n",
+                            "example": "USD",
+                            "minLength": 3,
+                            "maxLength": 3,
+                            "enum": [
+                              "AED",
+                              "AFN",
+                              "ALL",
+                              "AMD",
+                              "ANG",
+                              "AOA",
+                              "ARS",
+                              "AUD",
+                              "AWG",
+                              "AZN",
+                              "BAM",
+                              "BBD",
+                              "BDT",
+                              "BGN",
+                              "BHD",
+                              "BIF",
+                              "BMD",
+                              "BND",
+                              "BOB",
+                              "BRL",
+                              "BSD",
+                              "BTN",
+                              "BWP",
+                              "BYN",
+                              "BZD",
+                              "CAD",
+                              "CDF",
+                              "CHF",
+                              "CLP",
+                              "CNY",
+                              "COP",
+                              "CRC",
+                              "CUC",
+                              "CUP",
+                              "CVE",
+                              "CZK",
+                              "DJF",
+                              "DKK",
+                              "DOP",
+                              "DZD",
+                              "EGP",
+                              "ERN",
+                              "ETB",
+                              "EUR",
+                              "FJD",
+                              "FKP",
+                              "GBP",
+                              "GEL",
+                              "GGP",
+                              "GHS",
+                              "GIP",
+                              "GMD",
+                              "GNF",
+                              "GTQ",
+                              "GYD",
+                              "HKD",
+                              "HNL",
+                              "HRK",
+                              "HTG",
+                              "HUF",
+                              "IDR",
+                              "ILS",
+                              "IMP",
+                              "INR",
+                              "IQD",
+                              "IRR",
+                              "ISK",
+                              "JEP",
+                              "JMD",
+                              "JOD",
+                              "JPY",
+                              "KES",
+                              "KGS",
+                              "KHR",
+                              "KMF",
+                              "KPW",
+                              "KRW",
+                              "KWD",
+                              "KYD",
+                              "KZT",
+                              "LAK",
+                              "LBP",
+                              "LKR",
+                              "LRD",
+                              "LSL",
+                              "LYD",
+                              "MAD",
+                              "MDL",
+                              "MGA",
+                              "MKD",
+                              "MMK",
+                              "MNT",
+                              "MOP",
+                              "MRO",
+                              "MUR",
+                              "MVR",
+                              "MWK",
+                              "MXN",
+                              "MYR",
+                              "MZN",
+                              "NAD",
+                              "NGN",
+                              "NIO",
+                              "NOK",
+                              "NPR",
+                              "NZD",
+                              "OMR",
+                              "PAB",
+                              "PEN",
+                              "PGK",
+                              "PHP",
+                              "PKR",
+                              "PLN",
+                              "PYG",
+                              "QAR",
+                              "RON",
+                              "RSD",
+                              "RUB",
+                              "RWF",
+                              "SAR",
+                              "SBD",
+                              "SCR",
+                              "SDG",
+                              "SEK",
+                              "SGD",
+                              "SHP",
+                              "SLL",
+                              "SOS",
+                              "SPL",
+                              "SRD",
+                              "STD",
+                              "SVC",
+                              "SYP",
+                              "SZL",
+                              "THB",
+                              "TJS",
+                              "TMT",
+                              "TND",
+                              "TOP",
+                              "TRY",
+                              "TTD",
+                              "TVD",
+                              "TWD",
+                              "TZS",
+                              "UAH",
+                              "UGX",
+                              "USD",
+                              "UYU",
+                              "UZS",
+                              "VEF",
+                              "VND",
+                              "VUV",
+                              "WST",
+                              "XAF",
+                              "XCD",
+                              "XDR",
+                              "XOF",
+                              "XPF",
+                              "XTS",
+                              "XXX",
+                              "YER",
+                              "ZAR",
+                              "ZMW",
+                              "ZWD"
+                            ]
                           },
                           {
                             "description": "Currency\nIdentification of the currency in which the account is held.\nUsage: Currency should only be used in case one and the same account number covers several currencies and the initiating party needs to identify which currency needs to be used for settlement on the account.\n"
diff --git a/src/fspiop/v2_0_ISO20022/openapi.ts b/src/fspiop/v2_0_ISO20022/openapi.ts
index a73dc45..e1016c3 100644
--- a/src/fspiop/v2_0_ISO20022/openapi.ts
+++ b/src/fspiop/v2_0_ISO20022/openapi.ts
@@ -557,9 +557,11 @@ export interface components {
         /**
          * ActiveCurrencyCode
          * @description A code allocated to a currency by a Maintenance Agency under an international identification scheme as described in the latest edition of the international standard ISO 4217 "Codes for the representation of currencies and funds".
+         *     NOTE: This has been modified away from the original ISO20022 pattern to enums.
          * @example USD
+         * @enum {string}
          */
-        ActiveCurrencyCode: string;
+        ActiveCurrencyCode: "AED" | "AFN" | "ALL" | "AMD" | "ANG" | "AOA" | "ARS" | "AUD" | "AWG" | "AZN" | "BAM" | "BBD" | "BDT" | "BGN" | "BHD" | "BIF" | "BMD" | "BND" | "BOB" | "BRL" | "BSD" | "BTN" | "BWP" | "BYN" | "BZD" | "CAD" | "CDF" | "CHF" | "CLP" | "CNY" | "COP" | "CRC" | "CUC" | "CUP" | "CVE" | "CZK" | "DJF" | "DKK" | "DOP" | "DZD" | "EGP" | "ERN" | "ETB" | "EUR" | "FJD" | "FKP" | "GBP" | "GEL" | "GGP" | "GHS" | "GIP" | "GMD" | "GNF" | "GTQ" | "GYD" | "HKD" | "HNL" | "HRK" | "HTG" | "HUF" | "IDR" | "ILS" | "IMP" | "INR" | "IQD" | "IRR" | "ISK" | "JEP" | "JMD" | "JOD" | "JPY" | "KES" | "KGS" | "KHR" | "KMF" | "KPW" | "KRW" | "KWD" | "KYD" | "KZT" | "LAK" | "LBP" | "LKR" | "LRD" | "LSL" | "LYD" | "MAD" | "MDL" | "MGA" | "MKD" | "MMK" | "MNT" | "MOP" | "MRO" | "MUR" | "MVR" | "MWK" | "MXN" | "MYR" | "MZN" | "NAD" | "NGN" | "NIO" | "NOK" | "NPR" | "NZD" | "OMR" | "PAB" | "PEN" | "PGK" | "PHP" | "PKR" | "PLN" | "PYG" | "QAR" | "RON" | "RSD" | "RUB" | "RWF" | "SAR" | "SBD" | "SCR" | "SDG" | "SEK" | "SGD" | "SHP" | "SLL" | "SOS" | "SPL" | "SRD" | "STD" | "SVC" | "SYP" | "SZL" | "THB" | "TJS" | "TMT" | "TND" | "TOP" | "TRY" | "TTD" | "TVD" | "TWD" | "TZS" | "UAH" | "UGX" | "USD" | "UYU" | "UZS" | "VEF" | "VND" | "VUV" | "WST" | "XAF" | "XCD" | "XDR" | "XOF" | "XPF" | "XTS" | "XXX" | "YER" | "ZAR" | "ZMW" | "ZWD";
         /**
          * ActiveOrHistoricCurrencyAndAmount
          * @description A number of monetary units specified in an active or a historic currency where the unit of currency is explicit and compliant with ISO 4217.
@@ -581,10 +583,12 @@ export interface components {
         /**
          * ActiveOrHistoricCurrencyCode
          * @description A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 "Codes for the representation of currencies and funds".
+         *     NOTE: This has been modified away from the original ISO20022 pattern to enums.
          *
          * @example USD
+         * @enum {string}
          */
-        ActiveOrHistoricCurrencyCode: string;
+        ActiveOrHistoricCurrencyCode: "AED" | "AFN" | "ALL" | "AMD" | "ANG" | "AOA" | "ARS" | "AUD" | "AWG" | "AZN" | "BAM" | "BBD" | "BDT" | "BGN" | "BHD" | "BIF" | "BMD" | "BND" | "BOB" | "BRL" | "BSD" | "BTN" | "BWP" | "BYN" | "BZD" | "CAD" | "CDF" | "CHF" | "CLP" | "CNY" | "COP" | "CRC" | "CUC" | "CUP" | "CVE" | "CZK" | "DJF" | "DKK" | "DOP" | "DZD" | "EGP" | "ERN" | "ETB" | "EUR" | "FJD" | "FKP" | "GBP" | "GEL" | "GGP" | "GHS" | "GIP" | "GMD" | "GNF" | "GTQ" | "GYD" | "HKD" | "HNL" | "HRK" | "HTG" | "HUF" | "IDR" | "ILS" | "IMP" | "INR" | "IQD" | "IRR" | "ISK" | "JEP" | "JMD" | "JOD" | "JPY" | "KES" | "KGS" | "KHR" | "KMF" | "KPW" | "KRW" | "KWD" | "KYD" | "KZT" | "LAK" | "LBP" | "LKR" | "LRD" | "LSL" | "LYD" | "MAD" | "MDL" | "MGA" | "MKD" | "MMK" | "MNT" | "MOP" | "MRO" | "MUR" | "MVR" | "MWK" | "MXN" | "MYR" | "MZN" | "NAD" | "NGN" | "NIO" | "NOK" | "NPR" | "NZD" | "OMR" | "PAB" | "PEN" | "PGK" | "PHP" | "PKR" | "PLN" | "PYG" | "QAR" | "RON" | "RSD" | "RUB" | "RWF" | "SAR" | "SBD" | "SCR" | "SDG" | "SEK" | "SGD" | "SHP" | "SLL" | "SOS" | "SPL" | "SRD" | "STD" | "SVC" | "SYP" | "SZL" | "THB" | "TJS" | "TMT" | "TND" | "TOP" | "TRY" | "TTD" | "TVD" | "TWD" | "TZS" | "UAH" | "UGX" | "USD" | "UYU" | "UZS" | "VEF" | "VND" | "VUV" | "WST" | "XAF" | "XCD" | "XDR" | "XOF" | "XPF" | "XTS" | "XXX" | "YER" | "ZAR" | "ZMW" | "ZWD";
         /**
          * @description AddressType2Code
          *     Specifies the type of address.
@@ -612,6 +616,15 @@ export interface components {
         } | {
             Prtry: components["schemas"]["GenericIdentification30"] & unknown;
         };
+        /**
+         * AmountTypeEnum
+         * @description NOTE: This pattern is not the original ISO20022 specification.
+         *           This represents the enum values when mapping to and from FSPIOP specification.
+         *
+         * @example SEND
+         * @enum {string}
+         */
+        AmountTypeEnum: "SEND" | "RECEIVE";
         /**
          * AnyBICDec2014Identifier
          * @description AnyBICDec2014Identifier
@@ -1166,6 +1179,78 @@ export interface components {
             Purp?: components["schemas"]["Purpose2Choice"] & unknown;
             VrfctnOfTerms?: components["schemas"]["CryptographicLockChoice"] & unknown;
         };
+        /**
+         * CreditTransferTransaction68_Put_FX_Quotes_ID
+         * @description Provides further details specific to the individual transaction(s) included in the message.
+         *
+         * @example {
+         *       "PmtId": {
+         *         "InstrId": "INSTRID",
+         *         "EndToEndId": "ENDTOENDID"
+         *       },
+         *       "PmtTpInf": {
+         *         "LclInstrm": {
+         *           "Cd": "CHQB",
+         *           "Prtry": "PROPRIETARY"
+         *         }
+         *       },
+         *       "IntrBkSttlmAmt": {
+         *         "Amount": 123.45,
+         *         "Ccy": "EUR"
+         *       },
+         *       "Dbtr": {
+         *         "Nm": "Debtor Name"
+         *       },
+         *       "DbtrAcct": {
+         *         "Id": {
+         *           "IBAN": "IBAN"
+         *         }
+         *       },
+         *       "DbtrAgt": {
+         *         "FinInstnId": {
+         *           "BICFI": "BICFI"
+         *         }
+         *       },
+         *       "CdtrAgt": {
+         *         "FinInstnId": {
+         *           "BICFI": "BICFI"
+         *         }
+         *       },
+         *       "Cdtr": {
+         *         "Nm": "Creditor Name"
+         *       },
+         *       "CdtrAcct": {
+         *         "Id": {
+         *           "IBAN": "IBAN"
+         *         }
+         *       },
+         *       "InstrForCdtrAgt": {
+         *         "Cd": "INSTRUCTION"
+         *       },
+         *       "Purp": {
+         *         "Cd": "CHAR"
+         *       },
+         *       "VrfctnOfTerms": {
+         *         "Cntt": "CONTENT",
+         *         "CnttTp": "PROPRIETARY"
+         *       }
+         *     }
+         */
+        CreditTransferTransaction68_Put_FX_Quotes_ID: {
+            PmtId: components["schemas"]["PaymentIdentification13"] & unknown;
+            PmtTpInf?: components["schemas"]["PaymentTypeInformation28"] & unknown;
+            UndrlygCstmrCdtTrf?: components["schemas"]["UnderlyingCustomerCreditTransfer"] & unknown;
+            IntrBkSttlmAmt: components["schemas"]["ActiveCurrencyAndAmount"] & unknown;
+            Dbtr: components["schemas"]["BranchAndFinancialInstitutionIdentification8"] & unknown;
+            DbtrAcct?: components["schemas"]["CashAccount40"] & unknown;
+            DbtrAgt?: components["schemas"]["BranchAndFinancialInstitutionIdentification8"] & unknown;
+            CdtrAgt?: components["schemas"]["BranchAndFinancialInstitutionIdentification8"] & unknown;
+            Cdtr: components["schemas"]["BranchAndFinancialInstitutionIdentification8"] & unknown;
+            CdtrAcct?: components["schemas"]["CashAccount40"] & unknown;
+            InstrForCdtrAgt?: components["schemas"]["InstructionForCreditorAgent3_Put_FX_Quotes_ID"] & unknown;
+            Purp?: components["schemas"]["Purpose2Choice"] & unknown;
+            VrfctnOfTerms?: components["schemas"]["CryptographicLockChoice"] & unknown;
+        };
         /**
          * CryptographicLockChoice
          * @description Cryptographically signed terms
@@ -1252,9 +1337,10 @@ export interface components {
         };
         /**
          * Exact32HexBinaryText
-         * @description Specifies a hexadecimal string with a length of 32 characters.
+         * @description Specifies a hexadecimal string.
+         *
+         *     NOTE: This pattern is not the original ISO20022 specification.
          *
-         * @example 1234567890ABCDEF1234567890ABCDEF
          */
         Exact32HexBinaryText: string;
         /**
@@ -1421,9 +1507,12 @@ export interface components {
          *       "ABOR": "ABORTED"
          *     }
          *
+         *     NOTE: enum enforcement is not apart of the ISO20022 specification, but is added here for FSPIOP mappings.
+         *
          * @example COMM
+         * @enum {string}
          */
-        ExternalPaymentTransactionStatus1Code: string;
+        ExternalPaymentTransactionStatus1Code: "COMM" | "RESV" | "RECV" | "ABOR";
         /**
          * ExternalPersonIdentification1Code
          * @description Specifies the external person identification code.
@@ -1789,7 +1878,7 @@ export interface components {
          */
         FxResponse_FICreditTransferConfirmation: {
             GrpHdr: components["schemas"]["GroupHeader113"] & unknown;
-            CdtTrfTxInf: components["schemas"]["CreditTransferTransaction68"] & unknown;
+            CdtTrfTxInf: components["schemas"]["CreditTransferTransaction68_Put_FX_Quotes_ID"] & unknown;
         };
         /**
          * Fxecute_FinancialInstitutionCreditTransferV12
@@ -2396,6 +2485,19 @@ export interface components {
             Cd?: components["schemas"]["ExternalCreditorAgentInstruction1Code"] & unknown;
             InstrInf?: components["schemas"]["Max140Text"] & unknown;
         };
+        /**
+         * InstructionForCreditorAgent3_Put_FX_Quotes_ID
+         * @description Further information related to the processing of the payment instruction, provided by the initiating party, and intended for the creditor agent.
+         *
+         * @example {
+         *       "Cd": "PHOA",
+         *       "InstrInf": "Please advise/contact next agent by phone."
+         *     }
+         */
+        InstructionForCreditorAgent3_Put_FX_Quotes_ID: {
+            Cd?: components["schemas"]["ExternalCreditorAgentInstruction1Code"] & unknown;
+            InstrInf?: components["schemas"]["AmountTypeEnum"] & unknown;
+        };
         /**
          * InstructionForNextAgent1
          * @description Further information related to the processing of the payment instruction, provided by the initiating party, and intended for the next agent in the payment chain.
@@ -2885,9 +2987,9 @@ export interface components {
          *     }
          */
         PaymentIdentification13: {
-            InstrId?: components["schemas"]["Max35Text"] & unknown;
-            EndToEndId?: components["schemas"]["Max35Text"] & unknown;
-            TxId: components["schemas"]["Max35Text"] & unknown;
+            InstrId?: components["schemas"]["ULIDIdentifier"] & unknown;
+            EndToEndId?: components["schemas"]["ULIDIdentifier"] & unknown;
+            TxId: components["schemas"]["ULIDIdentifier"] & unknown;
             UETR?: components["schemas"]["UUIDv4Identifier"] & unknown;
             ClrSysRef?: components["schemas"]["Max35Text"] & unknown;
         };
@@ -3749,6 +3851,11 @@ export interface components {
             GrpHdr: components["schemas"]["GroupHeader129"] & unknown;
             CdtTrfTxInf: components["schemas"]["CreditTransferTransaction67"] & unknown;
         };
+        /**
+         * ULIDIdentifier
+         * @example 01AN4Z07BY79KA1307SR9X4MV3
+         */
+        ULIDIdentifier: string;
         /**
          * UUIDv4Identifier
          * @example 8f3a3b2d-3b0a-4b3f-8e4e-1b2f3f4c5d6e
diff --git a/src/fspiop/v2_0_ISO20022/schemas.ts b/src/fspiop/v2_0_ISO20022/schemas.ts
index b817852..dea0f40 100644
--- a/src/fspiop/v2_0_ISO20022/schemas.ts
+++ b/src/fspiop/v2_0_ISO20022/schemas.ts
@@ -15,6 +15,7 @@ export namespace Schemas {
   export const ActiveOrHistoricCurrencyCode = JsonSchemas.ActiveOrHistoricCurrencyCode
   export const AddressType2Code = JsonSchemas.AddressType2Code
   export const AddressType3Choice = JsonSchemas.AddressType3Choice
+  export const AmountTypeEnum = JsonSchemas.AmountTypeEnum
   export const AnyBICDec2014Identifier = JsonSchemas.AnyBICDec2014Identifier
   export const BICFIDec2014Identifier = JsonSchemas.BICFIDec2014Identifier
   export const BaseOneRate = JsonSchemas.BaseOneRate
@@ -36,6 +37,7 @@ export namespace Schemas {
   export const CountryCode = JsonSchemas.CountryCode
   export const CreditTransferTransaction67 = JsonSchemas.CreditTransferTransaction67
   export const CreditTransferTransaction68 = JsonSchemas.CreditTransferTransaction68
+  export const CreditTransferTransaction68_Put_FX_Quotes_ID = JsonSchemas.CreditTransferTransaction68_Put_FX_Quotes_ID
   export const CryptographicLockChoice = JsonSchemas.CryptographicLockChoice
   export const DateAndDateTime2Choice = JsonSchemas.DateAndDateTime2Choice
   export const DateAndPlaceOfBirth1 = JsonSchemas.DateAndPlaceOfBirth1
@@ -95,6 +97,7 @@ export namespace Schemas {
   export const IdentificationVerificationIndicator = JsonSchemas.IdentificationVerificationIndicator
   export const Instruction4Code = JsonSchemas.Instruction4Code
   export const InstructionForCreditorAgent3 = JsonSchemas.InstructionForCreditorAgent3
+  export const InstructionForCreditorAgent3_Put_FX_Quotes_ID = JsonSchemas.InstructionForCreditorAgent3_Put_FX_Quotes_ID
   export const InstructionForNextAgent1 = JsonSchemas.InstructionForNextAgent1
   export const LEIIdentifier = JsonSchemas.LEIIdentifier
   export const LocalInstrument2Choice = JsonSchemas.LocalInstrument2Choice
@@ -162,6 +165,7 @@ export namespace Schemas {
   export const TaxRecordPeriod1Code = JsonSchemas.TaxRecordPeriod1Code
   export const TermsRequest_FIToFICustomerCreditProposal = JsonSchemas.TermsRequest_FIToFICustomerCreditProposal
   export const TermsResponse_FIToFICustomerCreditConfirmation = JsonSchemas.TermsResponse_FIToFICustomerCreditConfirmation
+  export const ULIDIdentifier = JsonSchemas.ULIDIdentifier
   export const UUIDv4Identifier = JsonSchemas.UUIDv4Identifier
   export const UnderlyingCustomerCreditTransfer = JsonSchemas.UnderlyingCustomerCreditTransfer
   export const VerificationReason1Choice = JsonSchemas.VerificationReason1Choice
diff --git a/src/fspiop/v2_0_ISO20022/types.ts b/src/fspiop/v2_0_ISO20022/types.ts
index 2f3e767..d9ba279 100644
--- a/src/fspiop/v2_0_ISO20022/types.ts
+++ b/src/fspiop/v2_0_ISO20022/types.ts
@@ -15,6 +15,7 @@ export namespace Types {
   export type ActiveOrHistoricCurrencyCode = components['schemas']['ActiveOrHistoricCurrencyCode']
   export type AddressType2Code = components['schemas']['AddressType2Code']
   export type AddressType3Choice = components['schemas']['AddressType3Choice']
+  export type AmountTypeEnum = components['schemas']['AmountTypeEnum']
   export type AnyBICDec2014Identifier = components['schemas']['AnyBICDec2014Identifier']
   export type BICFIDec2014Identifier = components['schemas']['BICFIDec2014Identifier']
   export type BaseOneRate = components['schemas']['BaseOneRate']
@@ -36,6 +37,7 @@ export namespace Types {
   export type CountryCode = components['schemas']['CountryCode']
   export type CreditTransferTransaction67 = components['schemas']['CreditTransferTransaction67']
   export type CreditTransferTransaction68 = components['schemas']['CreditTransferTransaction68']
+  export type CreditTransferTransaction68_Put_FX_Quotes_ID = components['schemas']['CreditTransferTransaction68_Put_FX_Quotes_ID']
   export type CryptographicLockChoice = components['schemas']['CryptographicLockChoice']
   export type DateAndDateTime2Choice = components['schemas']['DateAndDateTime2Choice']
   export type DateAndPlaceOfBirth1 = components['schemas']['DateAndPlaceOfBirth1']
@@ -95,6 +97,7 @@ export namespace Types {
   export type IdentificationVerificationIndicator = components['schemas']['IdentificationVerificationIndicator']
   export type Instruction4Code = components['schemas']['Instruction4Code']
   export type InstructionForCreditorAgent3 = components['schemas']['InstructionForCreditorAgent3']
+  export type InstructionForCreditorAgent3_Put_FX_Quotes_ID = components['schemas']['InstructionForCreditorAgent3_Put_FX_Quotes_ID']
   export type InstructionForNextAgent1 = components['schemas']['InstructionForNextAgent1']
   export type LEIIdentifier = components['schemas']['LEIIdentifier']
   export type LocalInstrument2Choice = components['schemas']['LocalInstrument2Choice']
@@ -162,6 +165,7 @@ export namespace Types {
   export type TaxRecordPeriod1Code = components['schemas']['TaxRecordPeriod1Code']
   export type TermsRequest_FIToFICustomerCreditProposal = components['schemas']['TermsRequest_FIToFICustomerCreditProposal']
   export type TermsResponse_FIToFICustomerCreditConfirmation = components['schemas']['TermsResponse_FIToFICustomerCreditConfirmation']
+  export type ULIDIdentifier = components['schemas']['ULIDIdentifier']
   export type UUIDv4Identifier = components['schemas']['UUIDv4Identifier']
   export type UnderlyingCustomerCreditTransfer = components['schemas']['UnderlyingCustomerCreditTransfer']
   export type VerificationReason1Choice = components['schemas']['VerificationReason1Choice']