diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4902f03..7d5f141 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,5 +26,5 @@ jobs:
               with:
                   version: 9.5
                   php_version: 8.1
-                  bootstrap: vendor/autoload.php
+                  bootstrap: ./vendor/autoload.php
                   configuration: ./.github/workflows/phpunit.xml
diff --git a/.github/workflows/phpunit.xml b/.github/workflows/phpunit.xml
index e8bb9e7..bc8631b 100644
--- a/.github/workflows/phpunit.xml
+++ b/.github/workflows/phpunit.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd">
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        bootstrap="vendor/autoload.php" colors="true"
+        stopOnFailure="false"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+>
   <testsuites>
     <testsuite name="Unit">
       <directory suffix="Test.php">../../tests</directory>
diff --git a/validation/EIdentity.xsd b/validation/EIdentity.xsd
index 87c1dd1..5682a79 100644
--- a/validation/EIdentity.xsd
+++ b/validation/EIdentity.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1.4.0">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1.5.0">
 	<!--=====================================================================-->
 	<!--                        Schema Management                            -->
 	<!--=====================================================================-->
@@ -9,8 +9,8 @@
 		<xsd:documentation xml:lang="en"/>
 		<xsd:documentation>
 			<name>Identity Interface</name>
-			<revision version="1.4.0">
-				<date>2020-MAY-20</date>
+			<revision version="1.5.0">
+				<date>2023-NOVEMBER-03</date>
 			</revision>
 		</xsd:documentation>
 	</xsd:annotation>
@@ -44,6 +44,16 @@
 			<xsd:pattern value="[0-9a-zA-Z]{1,32}"/>
 		</xsd:restriction>
 	</xsd:simpleType>
+	
+	    <xsd:simpleType name="LanguageCodeSimpleType">
+        <!-- two small letters -->
+        <xsd:restriction base="xsd:token">
+            <xsd:minLength value="2"/>
+            <xsd:maxLength value="2"/>
+            <xsd:pattern value="[a-z]{2}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
 
 	<xsd:simpleType name="VersionSimpleType">
 		<xsd:restriction base="xsd:token">
@@ -51,14 +61,6 @@
 		</xsd:restriction>
 	</xsd:simpleType>
 
-	<xsd:simpleType name="LineNumberSimpleType">
-		<xsd:restriction base="xsd:token">
-			<xsd:minLength value="1"/>
-			<xsd:maxLength value="2"/>
-			<xsd:pattern value="[0-9]{1,2}"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	
     <xsd:simpleType name="AgeSimpleType">
 		<xsd:restriction base="xsd:token">
 			<xsd:minLength value="1"/>
@@ -105,7 +107,7 @@
 	<xsd:simpleType name="MessageCountSimpleType">
 		<xsd:restriction base="xsd:nonNegativeInteger">
 			<xsd:minInclusive value="0"/>
-			<xsd:maxInclusive value="1000"/>
+			<xsd:maxInclusive value="3000"/>
 		</xsd:restriction>
 	</xsd:simpleType>
 
@@ -169,7 +171,7 @@
             </xsd:simpleType>
         </xsd:union>
     </xsd:simpleType>
-
+  
     <xsd:simpleType name="TokenLength70SimpleType">
         <xsd:restriction base="xsd:token">
             <xsd:maxLength value="70"/>
@@ -182,13 +184,6 @@
         </xsd:restriction>
     </xsd:simpleType>
     
-    
-    <xsd:simpleType name="DescriptionSimpleType">
-        <xsd:restriction base="xsd:token">
-		      <xsd:pattern value="[-0-9a-zA-ZéèëïôóöüúÉÈËÏÔÓÖÜÚ€ ()+,.@&amp;=%&quot;&apos;/:;?$]{0,128}"/>
-        </xsd:restriction>
-    </xsd:simpleType>
-    
     <xsd:simpleType name="TokenLength256SimpleType">
         <xsd:restriction base="xsd:token">
             <xsd:maxLength value="256"/>
@@ -337,7 +332,7 @@
             <xsd:enumeration value="GENERATED"/>
             <xsd:enumeration value="CANCELED"/>
             <xsd:enumeration value="FAILED"/>
-            <!-- $$$ what are the other options -->
+            <!-- $$$ other options -->
          </xsd:restriction>
     </xsd:simpleType>
         
@@ -346,7 +341,7 @@
 	<xsd:complexType name="IdentityTransactionRequestType">
 		<xsd:sequence>
 			<xsd:element name="RequestCategory" type="RequestCategoryComplexType"/>
-			<xsd:element name="Description" type="DescriptionSimpleType"/>
+			<xsd:element name="Description" type="TokenLength128SimpleType"/>
 			<xsd:element name="DebtorReference" type="DebtorReferenceSimpleType" minOccurs="0"/>
 			<xsd:element name="SkinID" type="RelaxedIdentifierSimpleType" minOccurs="0"/>
 			<xsd:element name="DueDateTime" type="DateTimeSimpleType" minOccurs="0"/>
@@ -375,7 +370,6 @@
     </xsd:complexType>
     
 
-	
     <xsd:complexType name="IdentityTransactionResponseType">
         <xsd:sequence>
             <xsd:element name="DebtorReference" type="DebtorReferenceSimpleType" minOccurs="0"/>
@@ -496,9 +490,7 @@
 				</xsd:complexType>
 			</xsd:element>
 			<xsd:element name="DocumentSignatureRequest" type="DocumentSignatureRequestComplexType" minOccurs="0"/>
-			<!-- $$$  -->
-			<!-- $$$  -->
-			<!-- $$$  -->
+
 			<!-- $$$  -->
 		</xsd:sequence>
 	</xsd:complexType>
@@ -531,7 +523,7 @@
 
     <xsd:complexType name="TelephoneResponseComplexType" mixed="true">
         <xsd:simpleContent>
-            <xsd:extension base="PhoneNumberSimpleType">
+            <xsd:extension base="TokenLength70SimpleType">
 				<xsd:attributeGroup ref="ResponseCategoryAttributeGroup"/>
                 <xsd:attribute name="type" type="TelephoneTypeSimpleType"/>
             </xsd:extension>
@@ -748,14 +740,7 @@
                 </xsd:restriction>
             </xsd:simpleType>
 		</xsd:attribute>
-		<xsd:attribute name="language" default = "nl">
-			<xsd:simpleType>
-				<xsd:restriction base="xsd:token">
-					<xsd:enumeration value="en"/>
-					<xsd:enumeration value="nl"/>
-				</xsd:restriction>
-			</xsd:simpleType>
-        </xsd:attribute>
+        <xsd:attribute name="language" type="LanguageCodeSimpleType" default="nl"/>
 	</xsd:attributeGroup>
 
 	<xsd:attributeGroup name="RequestCategoryAttributeGroup">
diff --git a/validation/EMandate.xsd b/validation/EMandate.xsd
index fd2fc15..329b720 100644
--- a/validation/EMandate.xsd
+++ b/validation/EMandate.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1.4.0">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1.5.0">
 	<!--=====================================================================-->
 	<!--                        Schema Management                            -->
 	<!--=====================================================================-->
@@ -9,8 +9,8 @@
 		<xsd:documentation xml:lang="en"/>
 		<xsd:documentation>
 			<name>EMandate Interface</name>
-			<revision version="1.4.0">
-				<date>2020-MAY-20</date>
+			<revision version="1.5.0">
+				<date>2022-DECEMBER-12</date>
 			</revision>
 		</xsd:documentation>
 	</xsd:annotation>
@@ -48,6 +48,16 @@
             <xsd:pattern value="[0-9a-zA-Z_\-]{1,32}"/>
          </xsd:restriction>
     </xsd:simpleType>
+    
+   	<xsd:simpleType name="LanguageCodeSimpleType">
+        <!-- two small letters -->
+        <xsd:restriction base="xsd:token">
+            <xsd:minLength value="2"/>
+            <xsd:maxLength value="2"/>
+            <xsd:pattern value="[a-z]{2}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
 
 	<xsd:simpleType name="VersionSimpleType">
 		<xsd:restriction base="xsd:token">
@@ -86,7 +96,7 @@
 	<xsd:simpleType name="MessageCountSimpleType">
 		<xsd:restriction base="xsd:nonNegativeInteger">
 			<xsd:minInclusive value="0"/>
-			<xsd:maxInclusive value="1000"/>
+			<xsd:maxInclusive value="3000"/>
 		</xsd:restriction>
 	</xsd:simpleType>
     <xsd:simpleType name="StatusCodeSimpleType">
@@ -161,9 +171,6 @@
 		</xsd:restriction>
 	</xsd:simpleType>
 	
-	
-	
-	
 	<xsd:simpleType name="SkinIDSimpleType">
 		<xsd:restriction base="xsd:token">
 			<xsd:pattern value="[0-9a-zA-Z_\-]{0,32}"/>
@@ -184,8 +191,9 @@
 	
 	<xsd:simpleType name="ReasonSimpleType">
         <xsd:restriction base="xsd:token">
-		      <xsd:pattern value="[-0-9a-zA-ZéèëïôóöüúÉÈËÏÔÓÖÜÚ€ ()+,.@&amp;=%&quot;&apos;/:;?$]{1,70}"/>
-        </xsd:restriction>
+	        <xsd:pattern value="[-0-9a-zA-ZàáâäæãåāçćčèéêëēėęîïíīįìłñńôöòóœøōõßśšûüùúūÿžźżÀÁÂÄÆÃÅĀÇĆČÈÉÊËĒĖĘÎÏÍĪĮÌŁÑŃÔÖÒÓŒØŌÕŚŠÛÜÙÚŪŸŽŹŻ€ ()+,.@&amp;=%&quot;&apos;/:;?$]{1,70}"/>
+       		  
+      </xsd:restriction>
 	</xsd:simpleType>
 	
 	<xsd:simpleType name="DebtorReferenceSimpleType">
@@ -561,17 +569,9 @@
             </xsd:simpleType>
         </xsd:attribute>
 
-		<xsd:attribute name="language" default = "nl">
-			<xsd:simpleType>
-				<xsd:restriction base="xsd:token">
-					<xsd:enumeration value="en"/>
-					<xsd:enumeration value="nl"/>
-				</xsd:restriction>
-			</xsd:simpleType>
-		</xsd:attribute>
+        <xsd:attribute name="language" type="LanguageCodeSimpleType" default="nl"/>
+
 	</xsd:attributeGroup>
-	<!--                            ATTRIBUTES                               -->
-	<!--                              GROUPS                                 -->
-	<!--                             ELEMENTS                                -->
+
 	<xsd:element name="EMandateInterface" type="EMandateInterfaceType"/>
 </xsd:schema>
\ No newline at end of file
diff --git a/validation/EPayment.xsd b/validation/EPayment.xsd
index 361d7c8..65a8b5c 100644
--- a/validation/EPayment.xsd
+++ b/validation/EPayment.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1.5.0">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1.7.0">
     <!--=====================================================================-->
     <!--                        Schema Management                            -->
     <!--=====================================================================-->
@@ -9,8 +9,8 @@
         <xsd:documentation xml:lang="en"/>
         <xsd:documentation>
             <name>EPayment Interface</name>
-            <revision version="1.5.0">
-                <date>2020-NOVEMBER-26</date>
+            <revision version="1.6.0">
+                <date>2023-JANUARY-10</date>
             </revision>
         </xsd:documentation>
     </xsd:annotation>
@@ -129,9 +129,6 @@
     <xsd:simpleType name="DescriptionSimpleType">
         <xsd:restriction base="xsd:token">
 	        <xsd:pattern value="[-0-9a-zA-ZàáâäæãåāçćčèéêëēėęîïíīįìłñńôöòóœøōõßśšûüùúūÿžźżÀÁÂÄÆÃÅĀÇĆČÈÉÊËĒĖĘÎÏÍĪĮÌŁÑŃÔÖÒÓŒØŌÕŚŠÛÜÙÚŪŸŽŹŻ€ ()+,.@&amp;=%&quot;&apos;/:;?$]{1,35}"/>
-            <!--<xsd:pattern value="[-0-9a-zA-ZéèëïôóöüúÉÈËÏÔÓÖÜÚ€ ()+,.@&amp;=%&quot;&apos;/:;?$]{1,35}"/>  -->
-            <!-- <xsd:pattern value="[-\\x00-\\x7F ()+,.@&amp;=%&quot;&apos;/:;?$]{0,35}"/>  -->
-
         </xsd:restriction>
     </xsd:simpleType>
 
@@ -180,14 +177,7 @@
         </xsd:restriction>
     </xsd:simpleType>
 
-<!--     <xsd:simpleType name="CurrencySimpleType">
-        <xsd:restriction base="xsd:token">
-            <xsd:pattern value="[A-Z]{3}"/>
-        </xsd:restriction>
-    </xsd:simpleType>
- -->
-
-     <xsd:simpleType name="CurrencySimpleType">
+    <xsd:simpleType name="CurrencySimpleType">
         <xsd:restriction base="xsd:token">
             <xsd:enumeration value="EUR"/>
             <xsd:enumeration value="GBP"/>
@@ -288,6 +278,7 @@
 			<xsd:enumeration value="Pending"/>
             <xsd:enumeration value="SuccessManual"/>
             <xsd:enumeration value="BankSelected"/>
+            <xsd:enumeration value="Refunded"/>
         </xsd:restriction>
     </xsd:simpleType>
 
@@ -330,7 +321,10 @@
             <xsd:enumeration value="PAYPAL"/>
             <xsd:enumeration value="VISA_MASTER"/>
             <xsd:enumeration value="SOFORT"/>
+            <xsd:enumeration value="SOFORT_DIGITALSERVICES"/>
             <xsd:enumeration value="CARTE_BANCAIRE"/>
+            <xsd:enumeration value="BANCONTACT"/>
+            <xsd:enumeration value="GIROPAY"/>
         </xsd:restriction>
     </xsd:simpleType>
     
@@ -468,59 +462,9 @@
     
     
     
-    <!-- BEGIN - DebtorWallet additions -->
-    
-    
-    <xsd:simpleType name="CreditCardMonthSimpleType">
-        <xsd:restriction base="xsd:token">
-            <xsd:pattern value="0[1-9]|1[02]"/> 
-        </xsd:restriction>
-    </xsd:simpleType>
-     
-    <xsd:simpleType name="CreditCardYearSimpleType">
-        <xsd:restriction base="xsd:token">
-            <xsd:pattern value="202[0-9]|203[0-9]|204[0-9]"/>
-        </xsd:restriction>
-    </xsd:simpleType>
- 
-    
-     <xsd:simpleType name="CreditCardSecurityCodeSimpleType">
-        <xsd:restriction base="xsd:token">
-            <xsd:pattern value="[0-9]{3,4}"/>  <!-- 3 or 4 digits -->
-        </xsd:restriction>
-    </xsd:simpleType>
-    
-    <xsd:simpleType name="CreditCardNumberSimpleType">
-        <xsd:restriction base="xsd:token">  
-	       	<xsd:minLength value="13"/>
-            <xsd:pattern value="[-0-9 ]+"/> <!--digits, spaces, dashes -->
-        </xsd:restriction>
-    </xsd:simpleType>
-
-    <xsd:simpleType name="CreditCardNameSimpleType">
-        <xsd:restriction base="xsd:token">
-	        <xsd:minLength value="1"/>
-            <xsd:maxLength value="32"/>
-        </xsd:restriction>
-    </xsd:simpleType>
-    
-    <xsd:complexType name="CreditCardExpirationDateComplexType">
-        <xsd:sequence>
-            <xsd:element name="Month" type="CreditCardMonthSimpleType" minOccurs="1"/>
-            <xsd:element name="Year" type="CreditCardYearSimpleType" minOccurs="1"/>
-
-        </xsd:sequence>
-    </xsd:complexType>
-       
-    
+    <!-- BEGIN - DebtorWallet additions -->    
    <xsd:complexType name="DebtorCreditCardComplexType">
-<!--         <xsd:all>
-            <xsd:element name="CardNumber" type="CreditCardNumberSimpleType" minOccurs="1"/>
-            <xsd:element name="Name" type="CreditCardNameSimpleType" minOccurs="1"/>
-            <xsd:element name="SecurityCode" type="CreditCardSecurityCodeSimpleType" minOccurs="1"/>
-            <xsd:element name="ExpirationDate" type="CreditCardExpirationDateComplexType" minOccurs="1"/>
-        </xsd:all>
- -->    </xsd:complexType>
+   </xsd:complexType>
 
     <xsd:complexType name="IDealComplexType">
         <xsd:all>
@@ -528,20 +472,17 @@
         </xsd:all>
     </xsd:complexType>
 
-    <xsd:complexType name="PayPalComplexType">
- <!--        <xsd:all>
-	        <xsd:element name="PayPalAccount" type="EmailSimpleType" minOccurs="1"/>
-      </xsd:all>
- -->    </xsd:complexType>
+    <xsd:complexType name="PayPalComplexType"></xsd:complexType>
  
-    <xsd:complexType name="SofortComplexType">
- 
-    </xsd:complexType>
+    <xsd:complexType name="SofortComplexType"></xsd:complexType>
     
-   <xsd:complexType name="CarteBancaireComplexType">
- 
-    </xsd:complexType>
+    <xsd:complexType name="SofortDigitalServicesComplexType"></xsd:complexType>
+
+    <xsd:complexType name="CarteBancaireComplexType"></xsd:complexType>
 
+    <xsd:complexType name="BancontactComplexType"></xsd:complexType>
+
+    <xsd:complexType name="GiropayComplexType"></xsd:complexType>
 
     <xsd:complexType name="DebtorWalletComplexType">
         <xsd:choice>
@@ -549,14 +490,13 @@
             <xsd:element name="PayPal" type="PayPalComplexType" maxOccurs="1"/>
             <xsd:element name="CreditCard" type="DebtorCreditCardComplexType" maxOccurs="1"/>
             <xsd:element name="Sofort" type="SofortComplexType" maxOccurs="1"/>
+            <xsd:element name="SofortDigitalServices" type="SofortDigitalServicesComplexType" maxOccurs="1"/>
             <xsd:element name="CarteBancaire" type="CarteBancaireComplexType" maxOccurs="1"/>
+            <xsd:element name="Bancontact" type="BancontactComplexType" maxOccurs="1"/>
+            <xsd:element name="Giropay" type="GiropayComplexType" maxOccurs="1"/>
+
         </xsd:choice>
     </xsd:complexType>
-    
-    
-    
-    
-    
     <!-- END - DebtorWallet additions -->
     
 
@@ -566,7 +506,10 @@
             <xsd:element name="PayPalDetails" type="PayPalDetailsComplexType" minOccurs="0" maxOccurs="1"/>
             <xsd:element name="VisaMasterDetails" type="VisaMasterDetailsComplexType" minOccurs="0" maxOccurs="1"/>
             <xsd:element name="SofortDetails" type="SofortDetailsComplexType" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="SofortDigitalServicesDetails" type="SofortDigitalServicesDetailsComplexType" minOccurs="0" maxOccurs="1"/>
             <xsd:element name="CarteBancaireDetails" type="CarteBancaireDetailsComplexType" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="BancontactDetails" type="BancontactDetailsComplexType" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="GiropayDetails" type="GiropayDetailsComplexType" minOccurs="0" maxOccurs="1"/>
 
         </xsd:sequence>
     </xsd:complexType>
@@ -600,15 +543,35 @@
             <xsd:element name="DebtorAccount" type="TokenLength70SimpleType" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
-
+    
+   <xsd:complexType name="SofortDigitalServicesDetailsComplexType">
+        <xsd:sequence>
+            <xsd:element name="DebtorAccountName" type="TokenLength70SimpleType" minOccurs="0"/>
+            <xsd:element name="DebtorAccount" type="TokenLength70SimpleType" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    
     <xsd:complexType name="CarteBancaireDetailsComplexType">
         <xsd:sequence>
             <xsd:element name="DebtorAccountName" type="TokenLength70SimpleType" minOccurs="0"/>
             <xsd:element name="DebtorAccount" type="TokenLength70SimpleType" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
+    
+    <xsd:complexType name="BancontactDetailsComplexType">
+        <xsd:sequence>
+            <xsd:element name="DebtorAccountName" type="TokenLength70SimpleType" minOccurs="0"/>
+            <xsd:element name="DebtorAccount" type="TokenLength70SimpleType" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
 
 
+   <xsd:complexType name="GiropayDetailsComplexType">
+        <xsd:sequence>
+            <xsd:element name="DebtorAccountName" type="TokenLength70SimpleType" minOccurs="0"/>
+            <xsd:element name="DebtorAccount" type="TokenLength70SimpleType" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
 
 
     <xsd:complexType name="DocComplexType">
@@ -721,20 +684,8 @@
         </xsd:attribute>
 
         <xsd:attribute name="language" type="LanguageCodeSimpleType" default="nl"/>
-        <!--           <xsd:simpleType>
-                <xsd:restriction base="xsd:token">
-                    <xsd:enumeration value="en"/>
-                    <xsd:enumeration value="nl"/>
-                </xsd:restriction>
-            </xsd:simpleType> 
-        </xsd:attribute> 
- -->
     </xsd:attributeGroup>
-    <!--                            ATTRIBUTES                               -->
-
-    <!--                              GROUPS                                 -->
-
-    <!--                             ELEMENTS                                -->
+ 
     <xsd:element name="EPaymentInterface" type="EPaymentInterfaceType"/>
 
 </xsd:schema>
diff --git a/validation/IBANCheck.xsd b/validation/IBANCheck.xsd
index e222564..7cdcc5c 100644
--- a/validation/IBANCheck.xsd
+++ b/validation/IBANCheck.xsd
@@ -52,15 +52,6 @@
          </xsd:restriction>
     </xsd:simpleType>
 
-
-    <xsd:simpleType name="LanguageCodeSimpleType"> <!-- two small letters -->
-        <xsd:restriction base="xsd:token">
-            <xsd:minLength value="2"/>
-            <xsd:maxLength value="2"/>
-            <xsd:pattern value="[a-z]{2}"/>
-         </xsd:restriction>
-    </xsd:simpleType>
-
     <xsd:simpleType name="VersionSimpleType">
         <xsd:restriction base="xsd:token">
             <xsd:pattern value="[0-9].[0-9]"/>
@@ -86,7 +77,7 @@
     <xsd:simpleType name="MessageCountSimpleType">
         <xsd:restriction base="xsd:nonNegativeInteger">
             <xsd:minInclusive value="0"/>
-            <xsd:maxInclusive value="1000"/>
+            <xsd:maxInclusive value="3000"/>
         </xsd:restriction>
     </xsd:simpleType>
     
@@ -133,7 +124,16 @@
             <xsd:maxLength value="256"/>
         </xsd:restriction>
     </xsd:simpleType>
-    
+        
+   <xsd:simpleType name="NonEmptyRestrictedTokenLength80SimpleType">
+        <xsd:restriction base="xsd:token">
+            <xsd:minLength value="1"/>
+            <xsd:maxLength value="80"/>
+            <xsd:pattern value="[^&gt;&lt;]+"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+   
     <xsd:simpleType name="IBANTokenLength128SimpleType">
         <xsd:restriction base="xsd:token">
             <xsd:minLength value="1"/>
@@ -248,7 +248,7 @@
     <xsd:complexType name="IBANCheckTransactionRequestType">
         <xsd:all>
             <xsd:element name="IBAN" type="IBANTokenLength128SimpleType"/>
-            <xsd:element name="AssumedName" type="TokenLength256SimpleType"/>
+            <xsd:element name="AssumedName" type="NonEmptyRestrictedTokenLength80SimpleType"/>
 
 			<xsd:element name="DebtorReference" type="DebtorReferenceSimpleType" minOccurs="0"/>
 
@@ -269,7 +269,7 @@
     <xsd:complexType name="IBANCheckTransactionResponseType">
        <xsd:all>
             <xsd:element name="IBAN" type="IBANTokenLength128SimpleType"/>
-            <xsd:element name="AssumedName" type="TokenLength256SimpleType" minOccurs="0"/>
+            <xsd:element name="AssumedName" type="NonEmptyRestrictedTokenLength80SimpleType"/>
 			<xsd:element name="DebtorReference" type="DebtorReferenceSimpleType" minOccurs="0"/>
 			
 			<xsd:element name="IBANCheckResult" type="IBANCheckResultComplexType"/>
@@ -286,6 +286,7 @@
 
     
     
+    
          
     <!--                      OTHER COMPLEX TYPES                            -->    
     <xsd:complexType name="ErrorComplexType">